diff options
-rw-r--r-- | data/Makefile.am | 5 | ||||
-rw-r--r-- | data/NetworkManagerInfo.conf (renamed from src/jarabe/hardware/NetworkManagerInfo.conf) | 0 | ||||
-rw-r--r-- | src/jarabe/hardware/Makefile.am | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 8a31c67..40e6e36 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -29,6 +29,9 @@ mime_xml_files = $(mime_xml_in_files:.xml.in=.xml) mimedir = $(datadir)/mime/packages mime_DATA = $(mime_xml_files) +nmservicedir = $(sysconfdir)/dbus-1/system.d/ +nmservice_DATA = NetworkManagerInfo.conf + install-data-hook: if ENABLE_UPDATE_MIMEDB if [ -z "$$DESTDIR" ]; then \ @@ -43,5 +46,5 @@ if ENABLE_UPDATE_MIMEDB fi endif -EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(mime_xml_in_files) em.py gtkrc.em +EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) diff --git a/src/jarabe/hardware/NetworkManagerInfo.conf b/data/NetworkManagerInfo.conf index 4fb8270..4fb8270 100644 --- a/src/jarabe/hardware/NetworkManagerInfo.conf +++ b/data/NetworkManagerInfo.conf diff --git a/src/jarabe/hardware/Makefile.am b/src/jarabe/hardware/Makefile.am index 1a05c88..5c11a72 100644 --- a/src/jarabe/hardware/Makefile.am +++ b/src/jarabe/hardware/Makefile.am @@ -3,8 +3,3 @@ sugar_PYTHON = \ __init__.py \ hardwaremanager.py \ schoolserver.py - -dbusservicedir = $(sysconfdir)/dbus-1/system.d/ -dbusservice_DATA = NetworkManagerInfo.conf - -EXTRA_DIST = $(dbusservice_DATA) |