[Setup-tool-hackers] PATCH: builddir != srcdir fixes

[Jason Leach <jasonleach usa net>]

Hey XST hackers,

Patch fixing compiles when builddir != srcdir, the case for my
environment with it's crazy scripts.

Basically in the src/* dirs, the foo.desktop.menu and foo.security are
generated from .in files, and will end up in the builddir.  In the
Makefile.am's, down at the bottom in the install-data-local: section,
it tries to install $(srcdir)/foo.desktop.menu and
$(srcdir)/foo.security to their locations.  This should instead be
$(top_builddir)/src/foo/foo.desktop.menu and so forth, but technically
you don't need the $(top_builddir)/src/foo (because that will always
equal the current dir), so you really just need to install
foo.desktop.menu to the right place... which is what this patch does
:-)

Patch is against HEAD, let me know if it's OK to commit, please CC me
because I haven't yet subscribed to this list (will soon).

Thanks,
Jason.
Index: src/boot/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/boot/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- src/boot/Makefile.am	2001/02/28 20:48:11	1.5
+++ src/boot/Makefile.am	2001/03/28 14:54:38
@@ -73,7 +73,7 @@
 install-data-local: $(desktop).menu $(desktop).cc
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/boot.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/boot.desktop
+	$(INSTALL_DATA) boot.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/boot.desktop
 ##	$(INSTALL_DATA) $(srcdir)/boot.desktop.cc $(DESTDIR)$(datadir)/control-center/System/boot.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/boot-admin
@@ -81,4 +81,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/boot.pam $(DESTDIR)$(sysconfdir)/pam.d/boot-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/boot-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/boot-admin
Index: src/common/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/common/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- src/common/Makefile.am	2001/03/21 11:29:57	1.19
+++ src/common/Makefile.am	2001/03/28 14:54:38
@@ -53,4 +53,4 @@
 ##	$(mkinstalldirs) $(DESTDIR)$(Systemdir)
 ##	$(INSTALL_DATA) $(srcdir)/System.directory $(DESTDIR)$(Systemdir)/.directory
 	$(mkinstalldirs) $(DESTDIR)$(Systemdirp)
-	$(INSTALL_DATA) $(srcdir)/System.directory $(DESTDIR)$(Systemdirp)/.directory
+	$(INSTALL_DATA) System.directory $(DESTDIR)$(Systemdirp)/.directory
Index: src/disks/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/disks/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- src/disks/Makefile.am	2001/02/28 20:48:14	1.13
+++ src/disks/Makefile.am	2001/03/28 14:54:38
@@ -70,7 +70,7 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/disks.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/disks.desktop
+	$(INSTALL_DATA) disks.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/disks.desktop
 ##	$(INSTALL_DATA) $(srcdir)/disks.desktop.cc $(DESTDIR)$(datadir)/control-center/System/disks.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/disks-admin
@@ -78,4 +78,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/disks.pam $(DESTDIR)$(sysconfdir)/pam.d/disks-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/disks-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/disks-admin
Index: src/memory/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/memory/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- src/memory/Makefile.am	2001/02/28 20:48:15	1.11
+++ src/memory/Makefile.am	2001/03/28 14:54:38
@@ -70,7 +70,7 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/memory.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/memory.desktop
+	$(INSTALL_DATA) memory.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/memory.desktop
 ##	$(INSTALL_DATA) $(srcdir)/memory.desktop.cc $(DESTDIR)$(datadir)/control-center/System/memory.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/memory-admin
@@ -78,4 +78,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/memory.pam $(DESTDIR)$(sysconfdir)/pam.d/memory-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/memory-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/memory-admin
Index: src/network/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/network/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- src/network/Makefile.am	2001/02/28 20:48:16	1.8
+++ src/network/Makefile.am	2001/03/28 14:54:38
@@ -67,7 +67,7 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/network.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/network.desktop
+	$(INSTALL_DATA) network.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/network.desktop
 ##	$(INSTALL_DATA) $(srcdir)/network.desktop.cc $(DESTDIR)$(datadir)/control-center/System/network.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/network-admin
@@ -75,4 +75,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/network.pam $(DESTDIR)$(sysconfdir)/pam.d/network-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/network-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/network-admin
Index: src/print/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/print/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- src/print/Makefile.am	2001/03/28 00:09:35	1.1
+++ src/print/Makefile.am	2001/03/28 14:54:38
@@ -57,5 +57,5 @@
 
 install-data-local: $(desktop).menu $(desktop).cc
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
-	$(INSTALL_DATA) $(srcdir)/print.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/print.desktop
+	$(INSTALL_DATA) print.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/print.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
Index: src/shares/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/shares/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- src/shares/Makefile.am	2001/02/28 20:48:16	1.12
+++ src/shares/Makefile.am	2001/03/28 14:54:38
@@ -75,7 +75,7 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/shares.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/shares.desktop
+	$(INSTALL_DATA) shares.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/shares.desktop
 ##	$(INSTALL_DATA) $(srcdir)/shares.desktop.cc $(DESTDIR)$(datadir)/control-center/System/shares.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/shares-admin
@@ -83,4 +83,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/shares.pam $(DESTDIR)$(sysconfdir)/pam.d/shares-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/shares-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/shares-admin
Index: src/time/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/time/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- src/time/Makefile.am	2001/02/28 20:48:17	1.16
+++ src/time/Makefile.am	2001/03/28 14:54:38
@@ -73,7 +73,7 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/time.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/time.desktop
+	$(INSTALL_DATA) time.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/time.desktop
 ##	$(INSTALL_DATA) $(srcdir)/time.desktop.cc $(DESTDIR)$(datadir)/control-center/System/time.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/time-admin
@@ -81,4 +81,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/time.pam $(DESTDIR)$(sysconfdir)/pam.d/time-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/time-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/time-admin
Index: src/users/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/users/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- src/users/Makefile.am	2001/03/19 17:36:47	1.19
+++ src/users/Makefile.am	2001/03/28 14:54:38
@@ -81,7 +81,7 @@
 install-data-local: $(desktop).menu $(desktop).cc
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 ##	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/System
-	$(INSTALL_DATA) $(srcdir)/users.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/users.desktop
+	$(INSTALL_DATA) users.desktop.menu $(DESTDIR)$(datadir)/gnome/apps/Settings/System/users.desktop
 ##	$(INSTALL_DATA) $(srcdir)/users.desktop.cc $(DESTDIR)$(datadir)/control-center/System/users.desktop
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/users-admin
@@ -89,4 +89,4 @@
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d
 	$(INSTALL_DATA) $(srcdir)/users.pam $(DESTDIR)$(sysconfdir)/pam.d/users-admin
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/security/console.apps
-	$(INSTALL_DATA) $(srcdir)/$(security) $(DESTDIR)$(sysconfdir)/security/console.apps/users-admin
+	$(INSTALL_DATA) $(security) $(DESTDIR)$(sysconfdir)/security/console.apps/users-admin