gnome-settings-daemon r74 - in trunk: . src

[wbolster svn gnome org]

Author: wbolster
Date: Mon Jan 28 13:39:25 2008
New Revision: 74
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=74&view=rev

Log:
2008-01-28  Wouter Bolsterlee  <wbolster svn gnome org>

	* src/Makefile.am:

	Don't use weird autofu stuff to install
	gnome-settings-daemon into another directory, but define
	gsddir and gsd_PROGRAMS instead. Fixes bug #504203.


Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jan 28 13:39:25 2008
@@ -10,20 +10,10 @@
 	$(SETTINGS_DAEMON_CFLAGS)				\
 	$(NULL)
 
-install-exec-local: install-gnome-settings-daemon
+gsddir = $(libexecdir)/gnome-settings-daemon
 
-uninstall-local:
-	$(RM) $(DESTDIR)$(libexecdir)/gnome-settings-daemon-gnome-settings-daemon
-
-install-gnome-settings-daemon:
-	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/gnome-settings-daemon
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) gnome-settings-daemon $(DESTDIR)$(libexecdir)/gnome-settings-daemon
-
-libexec_PROGRAMS = \
-	$(NULL)
-
-noinst_PROGRAMS= \
-	gnome-settings-daemon
+gsd_PROGRAMS = \
+	gnome-settings-daemon \
 	$(NULL)
 
 gnome-settings-manager-glue.h: gnome-settings-manager.xml Makefile.am