GNOME.org
 

Re: [gnome-db] rpms for 0.8.192

Rodrigo Moya wrote:
> If Chris Chabot doesn't answer your mail, please resend your patch
> to the list, and I'll apply it myself.

Still no reply from Chris, so it's probably not worth waiting any
longer.  An updated version of my patch is attached below.  See
<http://mail.gnome.org/archives/gnome-db-list/2002-July/msg00034.html>
for my original description of the changes.

One paragraph from that message bears repeating here:

    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.

I still believe that this is a good idea.
Index: libgda/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgda/ChangeLog,v
retrieving revision 1.333
diff -u -u -r1.333 ChangeLog
--- libgda/ChangeLog	2002/08/18 21:47:50	1.333
+++ libgda/ChangeLog	2002/08/19 23:35:19
@@ -1,3 +1,32 @@
+2002-08-19  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
+	
+	* Makefile.am: no need to explicitly list "*.in" files for
+	distribution, as automake takes care of these implicitly; use
+	standard $(EXTRA_DIST) list for distributing spec file
+
 2002-08-18  Rodrigo Moya <rodrigo gnome-db org>
 
 	* providers/default/gda-default-provider.c
Index: libgda/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgda/Makefile.am,v
retrieving revision 1.26
diff -u -u -r1.26 Makefile.am
--- libgda/Makefile.am	2002/06/18 20:19:56	1.26
+++ libgda/Makefile.am	2002/08/19 23:35:19
@@ -10,16 +10,14 @@
 	data \
 	doc
 
-dist-hook: libgda.spec
-	cp libgda.spec $(distdir)
-
 EXTRA_DIST = \
 	COPYING \
-	libgda.spec.in \
-	libgda.pc.in \
+	libgda.spec \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libgda.pc
+
+all-local: libgda.spec
Index: libgda/configure.in
===================================================================
RCS file: /cvs/gnome/libgda/configure.in,v
retrieving revision 1.173
diff -u -u -r1.173 configure.in
--- libgda/configure.in	2002/08/14 21:18:18	1.173
+++ libgda/configure.in	2002/08/19 23:35:20
@@ -612,7 +612,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/libgda.spec.in
===================================================================
RCS file: /cvs/gnome/libgda/libgda.spec.in,v
retrieving revision 1.22
diff -u -u -r1.22 libgda.spec.in
--- libgda/libgda.spec.in	2002/02/26 13:42:07	1.22
+++ libgda/libgda.spec.in	2002/08/19 23:35:20
@@ -1,19 +1,20 @@
 # set the defines below to build support for the selected sql layer(s)
 # defaults (and package names) are set for redhat 7.x
 # with postgres, mysql and odbc installed
+%define           FREETDS  0
 %define           MYSQL    1
-%define           POSTGRES 1
 %define           ODBC     1
 %define           ORACLE   0
-%define           SYBASE   0
+%define           POSTGRES 1
 %define           SQLITE   0
-%define           TDS      0
+%define           SYBASE   0
 
 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,18 +36,25 @@
 BuildRequires:    GConf2-devel
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    gnome-vfs2-devel
+BuildRequires:    ncurses-devel
+
+%if %{FREETDS}
+BuildRequires:    freetds-devel
+%endif
 
 %if %{MYSQL}
-Requires:         mysqlclient9
-BuildRequires:    mysqlclient9, mysql-devel
+BuildRequires:    mysql-devel
 %endif
 
 %if %{POSTGRES}
-Requires:         postgresql-libs
-BuildRequires:    postgresql-libs, postgresql-devel
+BuildRequires:    postgresql-devel
 %endif
 
+%if %{ODBC}
+BuildRequires:    unixODBC-devel
+%endif
 
+
 %description
 libgda is a library that eases the task of writing
 gnome database programs.
@@ -78,10 +86,83 @@
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+%if %{FREETDS}
+%package -n gda-freetds
+Summary:	GDA FreeTDS Provider
+Group:		System Environment/Libraries
+%description -n gda-freetds
+This package includes the GDA FreeTDS provider.
+%endif
+
+%if %{IBMDB2}
+%package -n gda-ibmdb2
+Summary:	GDA IBM DB2 Provider
+Group:		System Environment/Libraries
+%description -n gda-ibmdb2
+This package includes the GDA IBM DB2 provider.
+%endif
+
+%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 %{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 %{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 %{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 %{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
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
+%if %{FREETDS}
+CONFIG="$CONFIG --with-freetds"
+%endif
+
+%if %{IBMDB2}
+CONFIG="$CONFIG --with-ibmdb2"
+%endif
+
 %if %{MYSQL}
 CONFIG="$CONFIG --with-mysql"
 %endif
@@ -98,18 +179,14 @@
 CONFIG="$CONFIG --with-oracle"
 %endif
 
-%if %{SYBASE}
-CONFIG="$CONFIG --with-sybase"
-%endif
-
-%if %{TDS}
-CONFIG="$CONFIG --with-tds"
-%endif
-
 %if %{SQLITE}
 CONFIG="$CONFIG --with-sqlite"
 %endif
 
+%if %{SYBASE}
+CONFIG="$CONFIG --with-sybase"
+%endif
+
 
 %configure $CONFIG
 make %{?_smp_mflags}
@@ -121,12 +198,7 @@
 %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
 
 %clean
@@ -135,25 +207,87 @@
 %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 %{FREETDS}
+%files -n gda-freetds
+%{_libdir}/libgda/providers/libgda-freetds.so
+%endif
 
+%if %{IBMDB2}
+%files -n gda-ibmdb2
+%{_libdir}/libgda/providers/libgda-ibmdb2.so
+%endif
+
+%if %{MYSQL}
+%files -n gda-mysql
+%{_libdir}/libgda/providers/libgda-mysql.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 %{POSTGRES}
+%files -n gda-postgres
+%{_libdir}/libgda/providers/libgda-postgres.so
+%endif
+
+%if %{SQLITE}
+%files -n gda-sqlite
+%{_libdir}/libgda/providers/libgda-sqlite.so
+%endif
+
+%if %{SYBASE}
+%files -n gda-sybase
+%{_libdir}/libgda/providers/libgda-sybase.so
+%endif
+
+
 %changelog
+* Mon Aug 19 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: libgnomedb/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomedb/ChangeLog,v
retrieving revision 1.128
diff -u -u -r1.128 ChangeLog
--- libgnomedb/ChangeLog	2002/08/18 21:13:13	1.128
+++ libgnomedb/ChangeLog	2002/08/19 23:35:31
@@ -1,3 +1,17 @@
+2002-08-19  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
+	
+	* Makefile.am: no need to explicitly list "*.in" files for
+	distribution, as automake takes care of these implicitly; use
+	standard $(EXTRA_DIST) list for distributing spec file
+
 2002-08-18  Rodrigo Moya <rodrigo gnome-db org>
 
 	* libgnomedb/gnome-db-connection-properties.[ch]: moved from
Index: libgnomedb/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgnomedb/Makefile.am,v
retrieving revision 1.18
diff -u -u -r1.18 Makefile.am
--- libgnomedb/Makefile.am	2002/05/31 17:43:23	1.18
+++ libgnomedb/Makefile.am	2002/08/19 23:35:31
@@ -18,17 +18,15 @@
 
 EXTRA_DIST = \
 	gnome-db.png \
-	libgnomedb.pc.in \
-	libgnomedb.spec.in \
+	libgnomedb.spec \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in 
 
-dist-hook: libgnomedb.spec
-	cp libgnomedb.spec $(distdir)
-
 pixmapdir=$(datadir)/pixmaps/libgnomedb
 pixmap_DATA=gnome-db.png
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libgnomedb.pc
+
+all-local: libgnomedb.spec
Index: libgnomedb/libgnomedb.spec.in
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb.spec.in,v
retrieving revision 1.2
diff -u -u -r1.2 libgnomedb.spec.in
--- libgnomedb/libgnomedb.spec.in	2002/02/26 01:26:18	1.2
+++ libgnomedb/libgnomedb.spec.in	2002/08/19 23:35:31
@@ -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 Aug 19 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: gnome-db/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-db/ChangeLog,v
retrieving revision 1.150
diff -u -u -r1.150 ChangeLog
--- gnome-db/ChangeLog	2002/08/18 21:19:21	1.150
+++ gnome-db/ChangeLog	2002/08/19 23:35:42
@@ -1,3 +1,20 @@
+2002-08-19  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
+	
+	* Makefile.am: no need to explicitly list "*.in" files for
+	distribution, as automake takes care of these implicitly; use
+	standard $(EXTRA_DIST) list for distributing spec file
+
+	* doc/*/Makefile.am (install-data-local): prefix installation
+	directories with $(DESTDIR) to facilitate RPM building
+
 2002-08-18  Rodrigo Moya <rodrigo gnome-db org>
 
 	* lib/gnome-db-connection-properties.[ch]: moved to libgnomedb.
Index: gnome-db/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/Makefile.am,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile.am
--- gnome-db/Makefile.am	2002/05/19 16:02:44	1.19
+++ gnome-db/Makefile.am	2002/08/19 23:35:42
@@ -8,13 +8,12 @@
 	doc
 
 EXTRA_DIST = \
-	gnome-db.spec.in \
+	gnome-db.spec \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in 
 
-dist-hook: gnome-db.spec
-	cp gnome-db.spec $(distdir)
+all-local: gnome-db.spec
 
 ## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change
 ## MAINT@include macros/macros.dep
Index: gnome-db/gnome-db.spec.in
===================================================================
RCS file: /cvs/gnome/gnome-db/gnome-db.spec.in,v
retrieving revision 1.20
diff -u -u -r1.20 gnome-db.spec.in
--- gnome-db/gnome-db.spec.in	2002/02/26 01:26:57	1.20
+++ gnome-db/gnome-db.spec.in	2002/08/19 23:35:42
@@ -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 Aug 19 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: gnome-db/doc/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/C/Makefile.am,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile.am
--- gnome-db/doc/C/Makefile.am	2002/08/15 10:14:30	1.8
+++ gnome-db/doc/C/Makefile.am	2002/08/19 23:35:42
@@ -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: gnome-db/doc/es/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/es/Makefile.am,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile.am
--- gnome-db/doc/es/Makefile.am	2002/05/01 13:20:17	1.5
+++ gnome-db/doc/es/Makefile.am	2002/08/19 23:35:42
@@ -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: gnome-db/doc/fr/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/fr/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -u -r1.1.1.2 Makefile.am
--- gnome-db/doc/fr/Makefile.am	2002/07/09 17:28:00	1.1.1.2
+++ gnome-db/doc/fr/Makefile.am	2002/08/19 23:35:42
@@ -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: gnome-db/doc/it/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/it/Makefile.am,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile.am
--- gnome-db/doc/it/Makefile.am	2002/05/01 13:20:18	1.4
+++ gnome-db/doc/it/Makefile.am	2002/08/19 23:35:42
@@ -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: gnome-db/doc/pt_BR/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-db/doc/pt_BR/Makefile.am,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile.am
--- gnome-db/doc/pt_BR/Makefile.am	2002/05/01 13:20:18	1.4
+++ gnome-db/doc/pt_BR/Makefile.am	2002/08/19 23:35:42
@@ -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]