GNOME.org
 

[gnome-db] RPM packaging fixes

Attached below please find diffs to fix up some build infrastructure
problems with gnome-db, libgnomedb, and libgda.  Most of the changes
concern RPM packaging, though there are a few other related tweaks.

Specifically:

- All ".spec.in" used @version@, but the configure script substitutes
  for @VERSION    Fixed.

- The %files sections of all specfiles needed to be updated to reflect
  what "make install" actually installs.

- The %files lists have also been modified to avoid installing ".a"
  and ".la" files for shared libraries which are effectively plugins
  and therefore are never linked with statically.

- The %files lists have also been modified to better reflect which
  directories are owned by the package, and which directories just
  happen to contain files the package installs.  For example,
  "/etc/libgda" is a directory we own, while "/usr/share/idl" is not.

- In the libgda specfile, additional subpackages have been created for
  each backend provider.  Not all of these have been tested; some may
  correspond to providers which are obsolete or unavailable.  One
  exception to this subpackaging scheme is the default (XML based)
  provider, which is included in the main libgda package.

- Various other small cleanups have been made, such as properly flagging
  configuration files and adding "URL:" tags pointing to the GNOME-DB
  project's web site.

Supporting changes to other files consist of the following:

- In several makefiles, put $(DESTDIR) in front of all installation
  directories.  This is necessary to support RPM's style of installing
  into a temporary directory before building the package.  Automake
  already does this for its own makefile fragments, but we had some
  manually added rules that needed to do it as well.

- In libgda's configure file, whenever linking with the readline
  library, link with the curses library as well.  Without this,
  readline appears to be missing and gda-config-tool is not built.

This ended up being a larger undertaking than I originally expected,
but hopefully these diffs will save someone else from similar trouble.
I don't claim that the RPM packages are perfect and final.  They are
workable, though, and should be a reasonable basis for future tweaking
as needed.

If I can make a friendly suggestion, it may be worthwhile to make
regular RPM building part of your development process.  For example,
when new CVS snapshots are posted, perhaps corresponding RPMs should
be built and posted as well.  That would go a long way toward avoiding
bit rot in the future, or at least detecting bit rot earlier in the
development process.

Special thanks to "gonzalo" and "carlos" from the #gnome-db IRC
channel for answering my many questions and cheering me on as I
worked.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgda/ChangeLog,v
retrieving revision 1.317
diff -u -r1.317 ChangeLog
--- ChangeLog	10 Jul 2002 02:10:53 -0000	1.317
+++ ChangeLog	16 Jul 2002 06:40:19 -0000
@@ -1,3 +1,28 @@
+2002-07-15  Ben Liblit  <liblit acm org>
+
+	* configure.in: assume that the readline library depends upon the
+	curses library
+
+	* libgda.spec.in: fix version number substitutions
+
+	* libgda.spec.in: remove some explicit "Requires:" prerequisites
+	that RPM will figure out on its own; remove explicit dependency on
+	older MySQL client libraries
+
+	* libgda.spec.in: require that the ODBC development package be
+	installed if we are building the ODBC provider
+
+	* libgda.spec.in: create distinct subpackages for each provider,
+	conditional on that provider actually being enabled; some of these
+	will need to be updated as the family of available providers
+	changes
+
+	* libgda.spec.in: update files list to match what "make install"
+	actually installs
+
+	* libgnomedb.spec.in: add URL tag pointing to GNOME-DB project's
+	web site
+	
 2002-07-10  Gonzalo Paniagua Javier <gonzalo gnome-db org>
 
 	* providers/postgres/gda-postgres-recordset.c: set number of rows to
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgda/configure.in,v
retrieving revision 1.167
diff -u -r1.167 configure.in
--- configure.in	8 Jul 2002 17:27:56 -0000	1.167
+++ configure.in	16 Jul 2002 06:40:19 -0000
@@ -549,7 +549,7 @@
 dnl ******************************
 dnl Check for readline/history/popt
 dnl ******************************
-AC_CHECK_LIB(readline,readline, READLINE_LIB=-lreadline)
+AC_CHECK_LIB(readline,readline, READLINE_LIB='-lreadline -lcurses', , -lcurses)
 AM_CONDITIONAL(READLINE_LIB, test ! "x$READLINE_LIB" = "x")
 AC_SUBST(READLINE_LIB)
 
Index: libgda.spec.in
===================================================================
RCS file: /cvs/gnome/libgda/libgda.spec.in,v
retrieving revision 1.22
diff -u -r1.22 libgda.spec.in
--- libgda.spec.in	26 Feb 2002 13:42:07 -0000	1.22
+++ libgda.spec.in	16 Jul 2002 06:40:19 -0000
@@ -11,9 +11,10 @@
 
 Summary:          Library for writing gnome database programs
 Name:             libgda
-Version:          @version@
+Version:          @VERSION@
 Release:          1
 Source:           %{name}-%{version}.tar.gz
+URL:              http://www.gnome-db.org/
 Group:            System Environment/Libraries
 License:          LGPL
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
@@ -35,17 +36,20 @@
 BuildRequires:    GConf2-devel
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    gnome-vfs2-devel
+BuildRequires:    ncurses-devel
 
 %if %{MYSQL}
-Requires:         mysqlclient9
-BuildRequires:    mysqlclient9, mysql-devel
+BuildRequires:    mysql-devel
 %endif
 
 %if %{POSTGRES}
-Requires:         postgresql-libs
 BuildRequires:    postgresql-libs, postgresql-devel
 %endif
 
+%if %{ODBC}
+BuildRequires:    unixODBC-devel
+%endif
+
 
 %description
 libgda is a library that eases the task of writing
@@ -78,6 +82,63 @@
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+%if %{MYSQL}
+%package -n gda-mysql
+Summary:	GDA MySQL Provider
+Group:		System Environment/Libraries
+%description -n gda-mysql
+This package includes the GDA MySQL provider.
+%endif
+
+%if %{POSTGRES}
+%package -n gda-postgres
+Summary:	GDA PostgreSQL Provider
+Group:		System Environment/Libraries
+%description -n gda-postgres
+This package includes the GDA PostgreSQL provider.
+%endif
+
+%if %{ODBC}
+%package -n gda-odbc
+Summary:	GDA ODBC Provider
+Group:		System Environment/Libraries
+%description -n gda-odbc
+This package includes the GDA ODBC provider.
+%endif
+
+%if %{ORACLE}
+%package -n gda-oracle
+Summary:	GDA Oracle Provider
+Group:		System Environment/Libraries
+%description -n gda-oracle
+This package includes the GDA Oracle provider.
+%endif
+
+%if %{SYBASE}
+%package -n gda-sybase
+Summary:	GDA Sybase Provider
+Group:		System Environment/Libraries
+%description -n gda-sybase
+This package includes the GDA Sybase provider.
+%endif
+
+%if %{SQLITE}
+%package -n gda-sqlite
+Summary:	GDA SQLite Provider
+Group:		System Environment/Libraries
+%description -n gda-sqlite
+This package includes the GDA SQLite provider.
+%endif
+
+%if %{TDS}
+%package -n gda-tds
+Summary:	GDA TDS Provider
+Group:		System Environment/Libraries
+%description -n gda-tds
+This package includes the GDA TDS provider.
+%endif
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -121,11 +182,6 @@
 %find_lang libgda-2
 
 %post -p /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
-for SCHEMA in %{_sysconfdir}/gconf/schemas/libgda.schemas; do
-/usr/bin/gconftool-2 --makefile-install-rule $SCHEMA > /dev/null 2>&1
-done
 
 %postun -p /sbin/ldconfig
 
@@ -135,25 +191,82 @@
 %files -f libgda-2.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
-%doc %{_datadir}/gnome/help/libgda
-%{_sysconfdir}/gconf/schemas/libgda.schemas
+#%doc %{_datadir}/gnome/help/libgda
+%dir %{_sysconfdir}/libgda
+%config(noreplace) %{_sysconfdir}/libgda/config
 %{_bindir}/*
+%{_datadir}/idl/libgda
+%{_datadir}/libgda
 %{_libdir}/*.so.*
-%{_libdir}/bonobo/servers/*
-%{_datadir}/idl
-%{_datadir}/libgda/dtd/*
+%dir %{_libdir}/libgda
+%dir %{_libdir}/libgda/providers
+%{_libdir}/libgda/providers/libgda-default.so
 
 %files devel
 %defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/libgda
-%{_includedir}/libgda/*
-%{_includedir}/libgda-report/*
+%{_includedir}/libgda
+%{_includedir}/libgda-report
+%{_libdir}/*.a
+%{_libdir}/*.la
 %{_libdir}/*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*
 
+%if %{MYSQL}
+%files -n gda-mysql
+%{_libdir}/libgda/providers/libgda-mysql.so
+%endif
+
+%if %{POSTGRES}
+%files -n gda-postgres
+%{_libdir}/libgda/providers/libgda-postgres.so
+%endif
+
+%if %{ODBC}
+%files -n gda-odbc
+%{_libdir}/libgda/providers/libgda-odbc.so
+%endif
+
+%if %{ORACLE}
+%files -n gda-oracle
+%{_libdir}/libgda/providers/libgda-oracle.so
+%endif
+
+%if %{SYBASE}
+%files -n gda-sybase
+%{_libdir}/libgda/providers/libgda-sybase.so
+%endif
+
+%if %{SQLITE}
+%files -n gda-sqlite
+%{_libdir}/libgda/providers/libgda-sqlite.so
+%endif
+
+%if %{TDS}
+%files -n gda-tds
+%{_libdir}/libgda/providers/libgda-tds.so
+%endif
+
 
 %changelog
+* Mon Jul 15 2002 Ben Liblit <liblit acm org>
+- Fixed version number substitutions
+
+- Removed some explicit "Requires:" prerequisites that RPM will figure
+  out on its own.  Removed explicit dependency on older MySQL client
+  libraries
+
+- Required that the ODBC development package be installed if we are
+  building the ODBC provider
+
+- Created distinct subpackages for each provider, conditional on that
+  provider actually being enabled; some of these will need to be
+  updated as the family of available providers changes
+
+- Updated files list to match what "make install" actually installs
+
+- Added URL tag pointing to GNOME-DB project's web site
+
 * Tue Feb 26 2002 Chris Chabot <chabotc reviewboard com>
 - Added defines and configure flags for all supported DB types
 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomedb/ChangeLog,v
retrieving revision 1.125
diff -u -r1.125 ChangeLog
--- ChangeLog	11 Jul 2002 17:10:33 -0000	1.125
+++ ChangeLog	16 Jul 2002 06:40:23 -0000
@@ -1,3 +1,13 @@
+2002-07-15  Ben Liblit  <liblit acm org>
+
+	* libgnomedb.spec.in: fix version number substitutions
+
+	* libgnomedb.spec.in: update files list to match what "make
+	install" actually installs
+
+	* libgnomedb.spec.in: add URL tag pointing to GNOME-DB project's
+	web site
+	
 2002-07-09  Rodrigo Moya <rodrigo gnome-db org>
 
 	* libgnomedb/gnome-db-grid.c: added a title bar (optional).
Index: libgnomedb.spec.in
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb.spec.in,v
retrieving revision 1.2
diff -u -r1.2 libgnomedb.spec.in
--- libgnomedb.spec.in	26 Feb 2002 01:26:18 -0000	1.2
+++ libgnomedb.spec.in	16 Jul 2002 06:40:23 -0000
@@ -1,19 +1,20 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
-Version:         @version@
+Version:         @VERSION@
 Release:         1
 Source:          %{name}-%{version}.tar.gz
+URL:             http://www.gnome-db.org/
 Group:           System Environment/Libraries
 License:         LGPL
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
 BuildRequires:   pkgconfig >= 0.8
 Requires:        libgnomeui >= 1.103.0
-Requires:        libgda >= @version@
+Requires:        libgda >= @VERSION@
 Requires:        gtk2 >= 1.3.6
 Requires:        libbonoboui
 Requires:        libglade2
 BuildRequires:   libgnomeui-devel >= 1.103.0
-BuildRequires:   libgda-devel >= @version@
+BuildRequires:   libgda-devel >= @VERSION@
 BuildRequires:   gtk2-devel >= 1.3.6
 BuildRequires:   libbonoboui-devel
 BuildRequires:   libglade2-devel
@@ -29,8 +30,8 @@
 Requires:        pkgconfig >= 0.8
 Requires:        libgnomeui >= 1.103.0
 Requires:        libgnomeui-devel >= 1.103.0
-Requires:        libgda >= @version@
-Requires:        libgda-devel >= @version@
+Requires:        libgda >= @VERSION@
+Requires:        libgda-devel >= @VERSION@
 Requires:        gtk2 >= 1.3.6
 Requires:        gtk2-devel >= 1.3.6
 Requires:        libbonoboui
@@ -55,7 +56,8 @@
 
 %find_lang libgnomedb-2
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 for SCHEMA in %{_sysconfdir}/gconf/schemas/libgnomedb.schemas; do
@@ -70,23 +72,35 @@
 %files -f libgnomedb-2.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
-%{_sysconfdir}/gconf/schemas/libgnomedb.schemas
+%{_bindir}/*
+%{_datadir}/control-center-2.0/capplets/*
+%{_datadir}/mime-info/*
+%{_datadir}/pixmaps/libgnomedb
 %{_libdir}/*.so.*
+%{_libdir}/bonobo/monikers/*.so
+%{_libdir}/bonobo/servers/*
+%{_libdir}/gnome-vfs-2.0/modules/*.so
 %{_libdir}/libglade/2.0/*.so
-%{_datadir}/pixmaps/*
-%{_datadir}/gnome-db/pixmaps/*
+%{_libexecdir}/*
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*
+%config(noreplace) %{_sysconfdir}/gnome-vfs-2.0/modules/*
 
 %files devel
 %defattr(-,root,root)
-%doc %{_datadir}/gtk-doc/html/libgnomedb/*
-%{_includedir}/libgnomedb/*
-%{_libdir}/libglade/2.0/*a
+%doc %{_datadir}/gtk-doc/html/libgnomedb
+%{_includedir}/libgnomedb
+%{_libdir}/*.a
+%{_libdir}/*.la
 %{_libdir}/*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*
 
 
 %changelog
+* Mon Jul 15 2002 Ben Liblit <liblit acm org>
+- Fixed version number substitutions
+- Updated files list to match what "make install" actually installs
+- Added URL tag pointing to GNOME-DB project's web site
+
 * Mon Feb 25 2002 Chris Chabot <chabotc reviewboard com>
 - Cleaned up formatting
 - Added requirements

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-db/ChangeLog,v
retrieving revision 1.149
diff -u -r1.149 ChangeLog
--- ChangeLog	8 Jul 2002 17:32:10 -0000	1.149
+++ ChangeLog	16 Jul 2002 06:40:28 -0000
@@ -1,3 +1,16 @@
+2002-07-15  Ben Liblit  <liblit acm org>
+
+	* gnome-db.spec.in: fix version number substitutions
+
+	* gnome-db.spec.in: update files list to match what "make
+	install" actually installs
+
+	* gnome-db.spec.in: add URL tag pointing to GNOME-DB project's web
+	site
+	
+	* doc/*/Makefile.am (install-data-local): prefix installation
+	directories with $(DESTDIR) to facilitate RPM building
+
 2002-07-08  Rodrigo Moya <rodrigo gnome-db org>
 
 	Released 0.8.192
Index: gnome-db.spec.in
===================================================================
RCS file: /cvs/gnome/gnome-db/gnome-db.spec.in,v
retrieving revision 1.20
diff -u -r1.20 gnome-db.spec.in
--- gnome-db.spec.in	26 Feb 2002 01:26:57 -0000	1.20
+++ gnome-db.spec.in	16 Jul 2002 06:40:28 -0000
@@ -1,21 +1,22 @@
 Summary:         GNOME database frontend/GUI
 Name:            gnome-db
-Version:         @version@
+Version:         @VERSION@
 Release:         1
 Source:          %{name}-%{version}.tar.gz
+URL:             http://www.gnome-db.org/
 Group:           System Environment/Libraries
 License:         LGPL
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
 BuildRequires:   pkgconfig >= 0.8
-Requires:        libgnomedb >= @version@
+Requires:        libgnomedb >= @VERSION@
 Requires:        libbonoboui
-Requires:        libgda >= @version@
+Requires:        libgda >= @VERSION@
 Requires:        gtk2 >= 1.3.1
 Requires:        libgnomeui >= 1.106.0
 Requires:        libglade2
-BuildRequires:   libgnomedb-devel >= @version@
+BuildRequires:   libgnomedb-devel >= @VERSION@
 BuildRequires:   libbonoboui-devel
-BuildRequires:   libgda-devel >= @version@
+BuildRequires:   libgda-devel >= @VERSION@
 BuildRequires:   gtk2-devel >= 1.3.1
 BuildRequires:   libgnomeui-devel >= 1.106
 BuildRequires:   libglade2-devel
@@ -55,14 +56,18 @@
 %doc %{_datadir}/gnome/help/gnome-db
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
-%{_libdir}/monikers/*
 %{_datadir}/applications/*
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/idl/*
-%{_datadir}/share/gnome-db/glade/*
+%{_datadir}/gnome-db
 
 
 %changelog
+* Mon Jul 15 2002 Ben Liblit <liblit acm org>
+- Fixed version number substitutions
+- Updated files list to match what "make install" actually installs
+- Added URL tag pointing to GNOME-DB project's web site
+
 * Mon Feb 25 2002 Chris Chabot <chabotc reviewboard com>
 - Added Requirements
 - Cleaned up formatting
Index: doc/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/C/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- doc/C/Makefile.am	1 May 2002 13:20:16 -0000	1.7
+++ doc/C/Makefile.am	16 Jul 2002 06:40:29 -0000
@@ -26,10 +26,10 @@
 	-cp gnome-db/*.html gnome-db/*.css $(distdir)/gnome-db
 
 install-data-local: gnome-db/index.html
-	$(mkinstalldirs) $(gnome_db_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(gnome_db_helpdir)/images
 	-for file in $(srcdir)/gnome-db/*.html $(srcdir)/gnome-db/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(gnome_db_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gnome_db_helpdir)/$$basefile; \
 	done
 
 gnome-db.ps: $(SGML_FILES)
Index: doc/es/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/es/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- doc/es/Makefile.am	1 May 2002 13:20:17 -0000	1.5
+++ doc/es/Makefile.am	16 Jul 2002 06:40:29 -0000
@@ -25,10 +25,10 @@
 	-cp gnome-db/*.html gnome-db/*.css $(distdir)/gnome-db
 
 install-data-local: gnome-db/index.html
-	$(mkinstalldirs) $(gnome_db_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(gnome_db_helpdir)/images
 	-for file in $(srcdir)/gnome-db/*.html $(srcdir)/gnome-db/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(gnome_db_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gnome_db_helpdir)/$$basefile; \
 	done
 
 gnome-db.ps: $(SGML_FILES)
Index: doc/fr/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/fr/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- doc/fr/Makefile.am	9 Jul 2002 17:28:00 -0000	1.1.1.2
+++ doc/fr/Makefile.am	16 Jul 2002 06:40:29 -0000
@@ -26,19 +26,19 @@
 
 
 install-data-local: gASQL/gasql.html 
-	${mkinstalldirs} ${Egnima_Lang_helpdir}/images
-	${mkinstalldirs} ${Egnima_Lang_helpdir}/stylesheet-images
+	${mkinstalldirs} $(DESTDIR)${Egnima_Lang_helpdir}/images
+	${mkinstalldirs} $(DESTDIR)${Egnima_Lang_helpdir}/stylesheet-images
 	-for file in ${srcdir}/gASQL/*.html ${srcdir}/gASQL/*.css; do \
 	basefile=`basename $$file`; \
-	${INSTALL_DATA} ${srcdir}/$$file ${Egnima_Lang_helpdir}/$$basefile; \
+	${INSTALL_DATA} ${srcdir}/$$file $(DESTDIR)${Egnima_Lang_helpdir}/$$basefile; \
 	done
 	-for file in ${srcdir}/gASQL/images/*; do \
 	basefile=`basename $$file`; \
-	${INSTALL_DATA} ${srcdir}/$$file ${Egnima_Lang_helpdir}/images/$$basefile; \
+	${INSTALL_DATA} ${srcdir}/$$file $(DESTDIR)${Egnima_Lang_helpdir}/images/$$basefile; \
 	done
 	-for file in ${srcdir}/gASQL/stylesheet-images/*; do \
 	basefile=`basename $$file`; \
-	${INSTALL_DATA} ${srcdir}/$$file ${Egnima_Lang_helpdir}/stylesheet-images/$$basefile; \
+	${INSTALL_DATA} ${srcdir}/$$file $(DESTDIR)${Egnima_Lang_helpdir}/stylesheet-images/$$basefile; \
 	done
 
 gASQL.ps: gASQL.sgml
Index: doc/it/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/it/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- doc/it/Makefile.am	1 May 2002 13:20:18 -0000	1.4
+++ doc/it/Makefile.am	16 Jul 2002 06:40:29 -0000
@@ -27,10 +27,10 @@
 	-cp gnome-db/*.html gnome-db/*.css $(distdir)/gnome-db
 
 install-data-local: gnome-db/index.html
-	$(mkinstalldirs) $(gnome_db_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(gnome_db_helpdir)/images
 	-for file in $(srcdir)/gnome-db/*.html $(srcdir)/gnome-db/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(gnome_db_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gnome_db_helpdir)/$$basefile; \
 	done
 
 gnome-db.ps: $(SGML_FILES)
Index: doc/pt_BR/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/pt_BR/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- doc/pt_BR/Makefile.am	1 May 2002 13:20:18 -0000	1.4
+++ doc/pt_BR/Makefile.am	16 Jul 2002 06:40:29 -0000
@@ -25,10 +25,10 @@
 	-cp gnome-db/*.html gnome-db/*.css $(distdir)/gnome-db
 
 install-data-local: gnome-db/index.html
-	$(mkinstalldirs) $(gnome_db_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(gnome_db_helpdir)/images
 	-for file in $(srcdir)/gnome-db/*.html $(srcdir)/gnome-db/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(gnome_db_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gnome_db_helpdir)/$$basefile; \
 	done
 
 gnome-db.ps: $(SGML_FILES)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]