NetworkManager r3624 - in trunk: . callouts system-settings/src

[dcbw svn gnome org]

Author: dcbw
Date: Thu May  1 10:11:14 2008
New Revision: 3624
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3624&view=rev

Log:
2008-05-01  Dan Williams  <dcbw redhat com>

	Patch from Michael Biebl <biebl debian org>

	* callouts/Makefile.am
	  callouts/org.freedesktop.nm_dispatcher.service.in
	  system-settings/src/Makefile.am
	  system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
		- use the right install location for dbus-activated stuff



Added:
   trunk/callouts/org.freedesktop.nm_dispatcher.service.in
      - copied, changed from r3622, /trunk/callouts/org.freedesktop.nm_dispatcher.service
   trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
      - copied, changed from r3622, /trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
Removed:
   trunk/callouts/org.freedesktop.nm_dispatcher.service
   trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
Modified:
   trunk/ChangeLog
   trunk/callouts/Makefile.am
   trunk/system-settings/src/Makefile.am

Modified: trunk/callouts/Makefile.am
==============================================================================
--- trunk/callouts/Makefile.am	(original)
+++ trunk/callouts/Makefile.am	Thu May  1 10:11:14 2008
@@ -46,15 +46,25 @@
 nm-dispatcher-glue.h: nm-dispatcher.xml
 	dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=nm-dispatcher-glue.h $(top_srcdir)/callouts/nm-dispatcher.xml
 
-dbusactivationdir = $(prefix)/share/dbus-1/system-services
-dbusactivation_DATA = org.freedesktop.nm_dispatcher.service
+dbusactivationdir = $(datadir)/dbus-1/system-services
+dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in
+dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
+
+%.service: %.service.in
+	$(edit) $< >$@
+
+edit = @sed \
+	-e 's|@sbindir[ ]|$(sbindir)|g' \
+	-e 's|@sysconfdir[ ]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[ ]|$(localstatedir)|g' \
+	-e 's|@libexecdir[ ]|$(libexecdir)|g'
 
 BUILT_SOURCES = nm-dispatcher-glue.h
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(dbusactivation_DATA)
 
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
-	$(dbusactivation_DATA) \
+	$(dbusactivation_in_files) \
 	nm-dispatcher.xml
 

Copied: trunk/callouts/org.freedesktop.nm_dispatcher.service.in (from r3622, /trunk/callouts/org.freedesktop.nm_dispatcher.service)
==============================================================================
--- /trunk/callouts/org.freedesktop.nm_dispatcher.service	(original)
+++ trunk/callouts/org.freedesktop.nm_dispatcher.service.in	Thu May  1 10:11:14 2008
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.nm_dispatcher
-Exec=/usr/libexec/nm-dispatcher.action
+Exec= libexecdir@/nm-dispatcher.action
 User=root
 

Modified: trunk/system-settings/src/Makefile.am
==============================================================================
--- trunk/system-settings/src/Makefile.am	(original)
+++ trunk/system-settings/src/Makefile.am	Thu May  1 10:11:14 2008
@@ -51,13 +51,24 @@
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-system-settings.conf
 
-dbusactivationdir = $(prefix)/share/dbus-1/system-services
-dbusactivation_DATA = org.freedesktop.NetworkManagerSystemSettings.service
+dbusactivationdir = $(datadir)/dbus-1/system-services
+dbusactivation_in_files = org.freedesktop.NetworkManagerSystemSettings.service.in
+dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
+
+%service: %service.in
+	$(edit) $< >$@
+
+edit = @sed \
+	-e 's|@sbindir[ ]|$(sbindir)|g' \
+	-e 's|@sysconfdir[ ]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[ ]|$(localstatedir)|g' \
+	-e 's|@libexecdir[ ]|$(libexecdir)|g'
 
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
-	$(dbusactivation_DATA)
+	$(dbusactivation_in_files)
 
 CLEANFILES = \
-	$(BUILT_SOURCES)
+	$(BUILT_SOURCES) \
+	$(dbusactivation_DATA)
 

Copied: trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in (from r3622, /trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service)
==============================================================================
--- /trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service	(original)
+++ trunk/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in	Thu May  1 10:11:14 2008
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.NetworkManagerSystemSettings
-Exec=/usr/sbin/nm-system-settings --config /etc/nm-system-settings.conf
+Exec= sbindir@/nm-system-settings --config /etc/nm-system-settings.conf
 User=root