colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-05-24 Robert Love <rml@novell.com>

Browse Source 
* gnome/applet/Makefile.am, gnome/vpn-properties/Makefile.am,
	  libnm-util/Makefile.am, src/Makefile.am,
	  vpn-daemons/openvpn/auth-dialog/Makefile.am,
	  vpn-daemons/openvpn/properties/Makefile.am,
	  vpn-daemons/pptp/auth-dialog/Makefile.am,
	  vpn-daemons/pptp/properties/Makefile.am,
	  vpn-daemons/vpnc/auth-dialog/Makefile.am,
	  vpn-daemons/vpnc/properties/Makefile.am: Do not override what the
	  user passed for --datadir, if anything, when setting the GNOME locale
	  directory.  It should be a function of the specified datadir and not
	  the prefix.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1759 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-05-24 15:08:22 +00:00
committed by Robert Love
parent a4ac9ec0fb
commit f560d48b7d
11 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2006-05-24 Robert Love <rml@novell.com>
* gnome/applet/Makefile.am, gnome/vpn-properties/Makefile.am,
libnm-util/Makefile.am, src/Makefile.am,
vpn-daemons/openvpn/auth-dialog/Makefile.am,
vpn-daemons/openvpn/properties/Makefile.am,
vpn-daemons/pptp/auth-dialog/Makefile.am,
vpn-daemons/pptp/properties/Makefile.am,
vpn-daemons/vpnc/auth-dialog/Makefile.am,
vpn-daemons/vpnc/properties/Makefile.am: Do not override what the
user passed for --datadir, if anything, when setting the GNOME locale
directory. It should be a function of the specified datadir and not
the prefix.
2006-05-24 Robert Love <rml@novell.com> 2006-05-24 Robert Love <rml@novell.com>
* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c, * gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,

2
gnome/applet/Makefile.am
View File

@@ -27,7 +27,7 @@ nm_applet_CPPFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
$(NULL) $(NULL)

2
gnome/vpn-properties/Makefile.am
View File

@@ -27,7 +27,7 @@ nm_vpn_properties_CFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
$(NULL) $(NULL)

2
libnm-util/Makefile.am
View File

@@ -9,7 +9,7 @@ libnm_util_la_CPPFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOMELOCALEDIR=\"$(datadir)/locale\"
if WITH_GCRYPT if WITH_GCRYPT
libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS)

3
src/Makefile.am
View File

@@ -106,10 +106,9 @@ NetworkManager_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \ -DLOCALSTATEDIR=\"$(localstatedir)\" \
-DNM_RUN_DIR=\"$(rundir)\" \ -DNM_RUN_DIR=\"$(rundir)\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DARP_DEBUG -DARP_DEBUG
NetworkManager_LDADD = \ NetworkManager_LDADD = \
$(DBUS_LIBS) \ $(DBUS_LIBS) \
$(GTHREAD_LIBS) \ $(GTHREAD_LIBS) \

2
vpn-daemons/openvpn/auth-dialog/Makefile.am
View File

@@ -14,7 +14,7 @@ nm_openvpn_auth_dialog_CPPFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
$(NULL) $(NULL)

2
vpn-daemons/openvpn/properties/Makefile.am
View File

@@ -18,7 +18,7 @@ libnm_openvpn_properties_la_CFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\"
libnm_openvpn_properties_la_LIBADD = \ libnm_openvpn_properties_la_LIBADD = \

2
vpn-daemons/pptp/auth-dialog/Makefile.am
View File

@@ -14,7 +14,7 @@ nm_pptp_auth_dialog_CPPFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
$(NULL) $(NULL)

2
vpn-daemons/pptp/properties/Makefile.am
View File

@@ -18,7 +18,7 @@ libnm_pptp_properties_la_CFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\"
libnm_pptp_properties_la_LIBADD = \ libnm_pptp_properties_la_LIBADD = \

2
vpn-daemons/vpnc/auth-dialog/Makefile.am
View File

@@ -14,7 +14,7 @@ nm_vpnc_auth_dialog_CPPFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
$(NULL) $(NULL)

2
vpn-daemons/vpnc/properties/Makefile.am
View File

@@ -18,7 +18,7 @@ libnm_vpnc_properties_la_CFLAGS = \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\"
libnm_vpnc_properties_la_LIBADD = \ libnm_vpnc_properties_la_LIBADD = \