NetworkManager r3976 - in trunk: . callouts src system-settings/plugins/keyfile

[dcbw svn gnome org]

Author: dcbw
Date: Sun Aug 17 22:54:49 2008
New Revision: 3976
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3976&view=rev

Log:
2008-08-17  Dan Williams  <dcbw redhat com>

	* callouts/Makefile.am
	  src/Makefile.am
		- Move dispatcher directory creation to callouts/Makefile.am

	* system-settings/plugins/keyfile/Makefile.am
		- Create keyfile connections directory in DESTDIR (bgo #546833)



Modified:
   trunk/ChangeLog
   trunk/callouts/Makefile.am
   trunk/src/Makefile.am
   trunk/system-settings/plugins/keyfile/Makefile.am

Modified: trunk/callouts/Makefile.am
==============================================================================
--- trunk/callouts/Makefile.am	(original)
+++ trunk/callouts/Makefile.am	Sun Aug 17 22:54:49 2008
@@ -78,6 +78,10 @@
 	-e 's|@localstatedir[ ]|$(localstatedir)|g' \
 	-e 's|@libexecdir[ ]|$(libexecdir)|g'
 
+dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
+install-data-hook:
+	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
+
 BUILT_SOURCES = nm-dispatcher-glue.h
 
 CLEANFILES = $(BUILT_SOURCES) $(dbusactivation_DATA)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Aug 17 22:54:49 2008
@@ -179,10 +179,8 @@
 	$(NetworkManager_DATA)
 
 rundir=$(localstatedir)/run/NetworkManager
-dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
 install-data-hook:
-	   $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
-	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
+	$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
 
 CLEANFILES = $(BUILT_SOURCES)
 

Modified: trunk/system-settings/plugins/keyfile/Makefile.am
==============================================================================
--- trunk/system-settings/plugins/keyfile/Makefile.am	(original)
+++ trunk/system-settings/plugins/keyfile/Makefile.am	Sun Aug 17 22:54:49 2008
@@ -11,7 +11,7 @@
 	writer.c \
 	writer.h
 
-keyfile_dir=$(sysconfdir)/NetworkManager/system-connections
+keyfiledir=$(sysconfdir)/NetworkManager/system-connections
 
 libnm_settings_plugin_keyfile_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
@@ -22,7 +22,7 @@
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I${top_srcdir}/libnm-glib \
-	-DKEYFILE_DIR=\""$(keyfile_dir)"\"
+	-DKEYFILE_DIR=\""$(keyfiledir)"\"
 
 libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_keyfile_la_LIBADD = \
@@ -41,6 +41,5 @@
 endif
 
 install-data-hook:
-	mkdir -p $(DESTDIR)$(keyfile_dir)
-
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)