[gnome-db]libgda RPM re-build (patch)

[Pavel Polischouk <pavelp geocities com>]

Hi!

As a common practice I rebuild all RPMS that don't come as part of 
RedHat distribution. And I also do it as non-root user. I tried to 
rebuild the libgda package and it complained about permission denied on 
copying files to system directories. (RPM build process should only 
install under RPM_BUILD_ROOT). There turned out to be 2 problems:
1. Perl install system does not use DESTDIR variable, it should be given 
PREFIX variable. (note uppercase - setting this variable does not break 
the automake installation).
2. install-*-local automake targets in several directores didn't use 
DESTDIR either.

Patch that fixes these problems attached. Applies cleanly to 0.2.10 release.

Among other things that I noticed, but didn't fix in this patch, is that 
`make distclean' doesn't work in Perl subdirectories (should be mapped 
to Perl's `realclean' target) and in some providers dirs (does not 
remove Makefile in all of them and objects/libs in gda-default-server.

Please CC me when replying, I'm not subscribed to this list.

Thanks,
Pavel.

diff -ur --exclude Makefile.in --exclude *.spec libgda-0.2.10/configure libgda-0.2.10.new/configure
--- libgda-0.2.10/doc/C/Makefile.am	Sat Jun  2 17:50:21 2001
+++ libgda-0.2.10.new/doc/C/Makefile.am	Tue Aug 14 14:05:56 2001
@@ -31,10 +31,10 @@
 	-cp libgda.html $(distdir)
 
 install-data-local: libgda.html
-	$(mkinstalldirs) $(libgda_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(libgda_helpdir)/images
 	-for file in $(srcdir)/libgda/*.html $(srcdir)/libgda/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(libgda_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(libgda_helpdir)/$$basefile; \
 	done
 
 libgda.ps: libgda.sgml
diff -ur --exclude Makefile.in --exclude *.spec libgda-0.2.10/doc/C/reference/libgda-client/Makefile.am libgda-0.2.10.new/doc/C/reference/libgda-client/Makefile.am
--- libgda-0.2.10/doc/C/reference/libgda-client/Makefile.am	Fri Jun  8 22:49:25 2001
+++ libgda-0.2.10.new/doc/C/reference/libgda-client/Makefile.am	Tue Aug 14 14:00:51 2001
@@ -124,9 +124,9 @@
 	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
+	$(mkinstalldirs) $(DESTDIR)$(DOC_DIR)
 	for i in $(DOC_DIR_INSTALL_FILES); do		  \
-		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR); \
 	done
 
 dist-hook:
diff -ur --exclude Makefile.in --exclude *.spec libgda-0.2.10/doc/C/reference/libgda-common/Makefile.am libgda-0.2.10.new/doc/C/reference/libgda-common/Makefile.am
--- libgda-0.2.10/doc/C/reference/libgda-common/Makefile.am	Sat Jun  2 17:50:23 2001
+++ libgda-0.2.10.new/doc/C/reference/libgda-common/Makefile.am	Tue Aug 14 14:00:20 2001
@@ -182,9 +182,9 @@
 	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
+	$(mkinstalldirs) $(DESTDIR)$(DOC_DIR)
 	for i in $(DOC_DIR_INSTALL_FILES); do		  \
-		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR); \
 	done
 
 dist-hook:
diff -ur --exclude Makefile.in --exclude *.spec libgda-0.2.10/doc/es/Makefile.am libgda-0.2.10.new/doc/es/Makefile.am
--- libgda-0.2.10/doc/es/Makefile.am	Sat Jun  2 17:50:24 2001
+++ libgda-0.2.10.new/doc/es/Makefile.am	Tue Aug 14 14:03:10 2001
@@ -29,10 +29,10 @@
 	-cp libgda.html $(distdir)
 
 install-data-local: libgda.html
-	$(mkinstalldirs) $(libgda_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(libgda_helpdir)/images
 	-for file in $(srcdir)/libgda/*.html $(srcdir)/libgda/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(libgda_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(libgda_helpdir)/$$basefile; \
 	done
 
 libgda.ps: libgda.sgml
diff -ur --exclude Makefile.in --exclude *.spec libgda-0.2.10/doc/pt_BR/Makefile.am libgda-0.2.10.new/doc/pt_BR/Makefile.am
--- libgda-0.2.10/doc/pt_BR/Makefile.am	Mon Oct 30 23:20:00 2000
+++ libgda-0.2.10.new/doc/pt_BR/Makefile.am	Tue Aug 14 14:03:46 2001
@@ -29,10 +29,10 @@
 	-cp libgda.html $(distdir)
 
 install-data-local: libgda.html
-	$(mkinstalldirs) $(libgdaptbr_helpdir)/images
+	$(mkinstalldirs) $(DESTDIR)$(libgdaptbr_helpdir)/images
 	-for file in $(srcdir)/libgda/*.html $(srcdir)/libgda/*.css; do \
 	basefile=`basename $$file`; \
-	$(INSTALL_DATA) $(srcdir)/$$file $(libgdaptbr_helpdir)/$$basefile; \
+	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(libgdaptbr_helpdir)/$$basefile; \
 	done
 
 libgda.ps: libgda.sgml
diff -ur --exclude Makefile.in --exclude *.spec libgda-0.2.10/libgda.spec.in libgda-0.2.10.new/libgda.spec.in
--- libgda-0.2.10/libgda.spec.in	Sat Jun  2 17:50:18 2001
+++ libgda-0.2.10.new/libgda.spec.in	Tue Aug 14 14:19:18 2001
@@ -141,7 +141,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} PREFIX=%{buildroot}/usr install
 %find_lang %name --with-gnome
 
 %clean