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. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1759 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -106,10 +106,9 @@ NetworkManager_CPPFLAGS = \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DLOCALSTATEDIR=\"$(localstatedir)\" \
|
||||
-DNM_RUN_DIR=\"$(rundir)\" \
|
||||
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
|
||||
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
|
||||
-DARP_DEBUG
|
||||
|
||||
|
||||
NetworkManager_LDADD = \
|
||||
$(DBUS_LIBS) \
|
||||
$(GTHREAD_LIBS) \
|
||||
|
Reference in New Issue
Block a user