system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-05-01 Dan Williams <dcbw@redhat.com>

Browse source 
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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3624 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-05-01 10:11:14 +00:00
parent 9c5d7e916b
commit c39d6e32d8
5 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
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
2008-04-30 Dan Williams <dcbw@redhat.com>
* src/nm-gsm-device.c

18
callouts/Makefile.am
View file

@ -46,15 +46,25 @@ nm_dispatcher_action_LDADD = \
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

2
callouts/org.freedesktop.nm_dispatcher.service → callouts/org.freedesktop.nm_dispatcher.service.in
View file

@ -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

19
system-settings/src/Makefile.am
View file

@ -51,13 +51,24 @@ nm-settings-system-glue.h: $(top_srcdir)/introspection/nm-settings-system.xml
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)

2
system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service → system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
View file

@ -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