diff --git a/ChangeLog b/ChangeLog
index 4ec20b66b..7ffe11f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,
diff --git a/gnome/applet/Makefile.am b/gnome/applet/Makefile.am
index c53ac218f..5a1062952 100644
--- a/gnome/applet/Makefile.am
+++ b/gnome/applet/Makefile.am
@@ -27,7 +27,7 @@ nm_applet_CPPFLAGS =									\
 	-DG_DISABLE_DEPRECATED								\
 	-DGDK_DISABLE_DEPRECATED								\
 	-DGNOME_DISABLE_DEPRECATED							\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"					\
 	-DVERSION=\"$(VERSION)\"								\
 	$(NULL)
 
diff --git a/gnome/vpn-properties/Makefile.am b/gnome/vpn-properties/Makefile.am
index a16474f52..550a6cc96 100644
--- a/gnome/vpn-properties/Makefile.am
+++ b/gnome/vpn-properties/Makefile.am
@@ -27,7 +27,7 @@ nm_vpn_properties_CFLAGS =                              \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\" \
         $(NULL)
 
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index a97e8a0c9..b67245d45 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -9,7 +9,7 @@ libnm_util_la_CPPFLAGS =				\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 if WITH_GCRYPT
 libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 80632e18d..04399f98e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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)					\
diff --git a/vpn-daemons/openvpn/auth-dialog/Makefile.am b/vpn-daemons/openvpn/auth-dialog/Makefile.am
index 4efbbae6b..6bc2a6804 100644
--- a/vpn-daemons/openvpn/auth-dialog/Makefile.am
+++ b/vpn-daemons/openvpn/auth-dialog/Makefile.am
@@ -14,7 +14,7 @@ nm_openvpn_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"			\
 	$(NULL)
 
diff --git a/vpn-daemons/openvpn/properties/Makefile.am b/vpn-daemons/openvpn/properties/Makefile.am
index 9682d02cc..ff145b4e9 100644
--- a/vpn-daemons/openvpn/properties/Makefile.am
+++ b/vpn-daemons/openvpn/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_openvpn_properties_la_CFLAGS =                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
 libnm_openvpn_properties_la_LIBADD =       \
diff --git a/vpn-daemons/pptp/auth-dialog/Makefile.am b/vpn-daemons/pptp/auth-dialog/Makefile.am
index bf405bfad..6698147e8 100644
--- a/vpn-daemons/pptp/auth-dialog/Makefile.am
+++ b/vpn-daemons/pptp/auth-dialog/Makefile.am
@@ -14,7 +14,7 @@ nm_pptp_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"			\
 	$(NULL)
 
diff --git a/vpn-daemons/pptp/properties/Makefile.am b/vpn-daemons/pptp/properties/Makefile.am
index b7b08c268..72a811ba4 100644
--- a/vpn-daemons/pptp/properties/Makefile.am
+++ b/vpn-daemons/pptp/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_pptp_properties_la_CFLAGS =                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
 libnm_pptp_properties_la_LIBADD =       \
diff --git a/vpn-daemons/vpnc/auth-dialog/Makefile.am b/vpn-daemons/vpnc/auth-dialog/Makefile.am
index 05098b9d0..09211c870 100644
--- a/vpn-daemons/vpnc/auth-dialog/Makefile.am
+++ b/vpn-daemons/vpnc/auth-dialog/Makefile.am
@@ -14,7 +14,7 @@ nm_vpnc_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"			\
 	$(NULL)
 
diff --git a/vpn-daemons/vpnc/properties/Makefile.am b/vpn-daemons/vpnc/properties/Makefile.am
index 907d75d82..9171d7623 100644
--- a/vpn-daemons/vpnc/properties/Makefile.am
+++ b/vpn-daemons/vpnc/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_vpnc_properties_la_CFLAGS =                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
 libnm_vpnc_properties_la_LIBADD =       \