fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 20:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-08-17 Dan Williams <dcbw@redhat.com>

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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3976 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-08-17 22:54:49 +00:00
parent 4872bf0b4d
commit a419bdfb9e
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
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)
2008-08-15 Dan Williams <dcbw@redhat.com>
Do connection sharing in a cleaner manner; all required iptables rules

4
callouts/Makefile.am
View file

@ -78,6 +78,10 @@ edit = @sed \
-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)

4
src/Makefile.am
View file

@ -179,10 +179,8 @@ EXTRA_DIST = \
$(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)

7
system-settings/plugins/keyfile/Makefile.am
View file

@ -11,7 +11,7 @@ libnm_settings_plugin_keyfile_la_SOURCES = \
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 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \
-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 @@ libnm_settings_plugin_keyfile_la_LIBADD += \
endif
install-data-hook:
mkdir -p $(DESTDIR)$(keyfile_dir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)