as_ac_removal

19 files changed, 50 insertions, 95 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 81ee816a..cfaf19a3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,49 +1,4 @@
 
-dnl as-ac-expand.m4 0.1.0
-dnl autostars m4 macro for expanding directories using configure's prefix
-dnl thomas@apestaart.org 
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
-
 dnl GTK_DOC_CHECK borrowed from cairo, thanks!
 
 dnl Usage:
diff --git a/configure.in b/configure.in
index 4a2c76be..6bb33a99 100644
--- a/configure.in
+++ b/configure.in
@@ -106,8 +106,6 @@ else
   AC_DEFINE(USE_PNP_IDS,1,[Whether builtin PNP IDs are to be used])
 fi
 
-AC_DEFINE_UNQUOTED(PCI_IDS_DIR,"$PCI_IDS_DIR", [Where PCI IDs are found])
-AC_DEFINE_UNQUOTED(USB_IDS_DIR,"$USB_IDS_DIR", [Where USB IDs are found])
 AC_SUBST(PCI_IDS_DIR)
 AC_SUBST(USB_IDS_DIR)
 AC_SUBST(USE_PCI_IDS)
@@ -589,25 +587,14 @@ AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes)
 AC_MSG_RESULT(yes)
 
 
-
-AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
-AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-AS_AC_EXPAND(DATADIR, $datadir)
-AS_AC_EXPAND(BINDIR, $bindir)
-AS_AC_EXPAND(SBINDIR, $sbindir)
-AS_AC_EXPAND(LIBDIR, $libdir)
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-
-
 AC_ARG_WITH(dbus-sys, [  --with-dbus-sys=<dir>   where D-BUS system.d directory is])
 
 if ! test -z "$with_dbus_sys" ; then
     DBUS_SYS_DIR="$with_dbus_sys"
 else
-    DBUS_SYS_DIR="$SYSCONFDIR/dbus-1/system.d"
+    DBUS_SYS_DIR="$sysconfdir/dbus-1/system.d"
 fi
 AC_SUBST(DBUS_SYS_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
 
 #### Check our operating system (distro-tweaks required)
 operating_system=unknown
@@ -633,22 +620,20 @@ AM_CONDITIONAL(OS_TYPE_RED_HAT, test x$with_os_type = xredhat, [Running on Red H
 if ! test -z "$with_pid_file"; then
    HALD_PID_FILE=$with_pid_file
 elif test x$with_os_type = xredhat ; then
-   HALD_PID_FILE=${LOCALSTATEDIR}/run/haldaemon.pid
+   HALD_PID_FILE=${localstatedir}/run/haldaemon.pid
 else
-   HALD_PID_FILE=${LOCALSTATEDIR}/run/hald/pid
+   HALD_PID_FILE=${localstatedir}/run/hald/pid
 fi
 
 AC_SUBST(HALD_PID_FILE)
-AC_DEFINE_UNQUOTED(HALD_PID_FILE, "$HALD_PID_FILE", [pid file])
 
 if ! test -z "$with_socket_dir"; then
     HALD_SOCKET_DIR=$with_socket_dir
 else
-    HALD_SOCKET_DIR=${LOCALSTATEDIR}/run/hald
+    HALD_SOCKET_DIR=${localstatedir}/run/hald
 fi
 
 AC_SUBST(HALD_SOCKET_DIR)
-AC_DEFINE_UNQUOTED(HALD_SOCKET_DIR, "$HALD_SOCKET_DIR", [socket dir])
 
 
 ALL_LINGUAS="ca cs da de el es et eu fi fr hu it ja km ko lt nb nl pa pl pt_BR pt ru sl_SI sv tr uk zh_CN zh_TW"
@@ -846,7 +831,6 @@ hald/freebsd/Makefile
 hald/freebsd/probing/Makefile
 hald/freebsd/libprobe/Makefile
 hald/freebsd/addons/Makefile
-hald/haldaemon
 hald-runner/Makefile
 libhal/Makefile
 libhal-storage/Makefile
@@ -884,13 +868,13 @@ echo "
                   ==============
 
         prefix:                      ${prefix}
-        libdir:                      ${LIBDIR}
-        libexecdir:                  ${LIBEXECDIR}
-        bindir:                      ${BINDIR}
-        sbindir:                     ${SBINDIR}
-        datadir:                     ${DATADIR}
-        sysconfdir:                  ${SYSCONFDIR}
-        localstatedir:               ${LOCALSTATEDIR}
+        libdir:                      ${libdir}
+        libexecdir:                  ${libexecdir}
+        bindir:                      ${bindir}
+        sbindir:                     ${sbindir}
+        datadir:                     ${datadir}
+        sysconfdir:                  ${sysconfdir}
+        localstatedir:               ${localstatedir}
         dbus-1 system.d dir:         ${DBUS_SYS_DIR}
         pci.ids dir:                 ${PCI_IDS_DIR}
         usb.ids dir:                 ${USB_IDS_DIR}
diff --git a/hald-runner/Makefile.am b/hald-runner/Makefile.am
index 990fdc89..65eb677c 100644
--- a/hald-runner/Makefile.am
+++ b/hald-runner/Makefile.am
@@ -4,9 +4,10 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
+	-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \
 	-I$(top_srcdir) \
 	@DBUS_CFLAGS@ @GLIB_CFLAGS@
 
diff --git a/hald/Makefile.am b/hald/Makefile.am
index 1ca01aca..74647d1c 100644
--- a/hald/Makefile.am
+++ b/hald/Makefile.am
@@ -7,9 +7,13 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
+	-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \
+	-DHALD_PID_FILE=\""$(HALD_PID_FILE)"\" \
+	-DPCI_IDS_DIR=\""$(PCI_IDS_DIR)"\" \
+	-DUSB_IDS_DIR=\""$(USB_IDS_DIR)"\" \
 	-I$(top_srcdir) \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
 
@@ -74,6 +78,15 @@ hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(H
 #### Init scripts fun
 SCRIPT_IN_FILES=haldaemon.in
 
+haldaemon: haldaemon.in Makefile
+	$(edit) $< >$@
+
+edit = sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@HALD_PID_FILE[@]|$(HALD_PID_FILE)|g'
+
 ## Red Hat start
 if OS_TYPE_RED_HAT
 
@@ -85,8 +98,9 @@ initd_SCRIPTS= 	\
 endif
  ## Red Hat end
 
-EXTRA_DIST =			\
-	hald_marshal.list hald-cache-test.sh
+EXTRA_DIST = \
+	hald_marshal.list hald-cache-test.sh \
+	$(SCRIPT_IN_FILES)
 
 hald_marshal.h: hald_marshal.list
 	glib-genmarshal $< --prefix=hald_marshal --header > $@
@@ -108,4 +122,5 @@ install-data-local:
 clean-local:
 	rm -f *~
 	rm -f hald_marshal.c hald_marshal.h
+	rm -f haldaemon
 
diff --git a/hald/dummy/Makefile.am b/hald/dummy/Makefile.am
index d5eba313..48cebfd4 100644
--- a/hald/dummy/Makefile.am
+++ b/hald/dummy/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) -I.. \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
diff --git a/hald/freebsd/Makefile.am b/hald/freebsd/Makefile.am
index c4e27d62..f70f2611 100644
--- a/hald/freebsd/Makefile.am
+++ b/hald/freebsd/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) -I.. \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
diff --git a/hald/freebsd/addons/Makefile.am b/hald/freebsd/addons/Makefile.am
index 90b9d834..90c0ee21 100644
--- a/hald/freebsd/addons/Makefile.am
+++ b/hald/freebsd/addons/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) \
 	@DBUS_CFLAGS@
diff --git a/hald/freebsd/libprobe/Makefile.am b/hald/freebsd/libprobe/Makefile.am
index 4174bcd4..a266617b 100644
--- a/hald/freebsd/libprobe/Makefile.am
+++ b/hald/freebsd/libprobe/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) -I.. \
 	@DBUS_CFLAGS@
diff --git a/hald/freebsd/probing/Makefile.am b/hald/freebsd/probing/Makefile.am
index f98c6205..fdba1eb7 100644
--- a/hald/freebsd/probing/Makefile.am
+++ b/hald/freebsd/probing/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) \
 	@DBUS_CFLAGS@
diff --git a/hald/haldaemon.in b/hald/haldaemon.in
index 004ec2c0..cd6dfde4 100755
--- a/hald/haldaemon.in
+++ b/hald/haldaemon.in
@@ -12,10 +12,10 @@
 #
 
 # Sanity checks.
-[ -x @SBINDIR@/hald ] || exit 0
+[ -x @sbindir@/hald ] || exit 0
 
 # Source function library.
-. @SYSCONFDIR@/rc.d/init.d/functions
+. @sysconfdir@/rc.d/init.d/functions
 
 # so we can rearrange this easily
 processname=hald
@@ -28,7 +28,7 @@ start() {
     daemon --check $servicename $processname
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && touch @LOCALSTATEDIR@/lock/subsys/$servicename
+    [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$servicename
 }
 
 stop() {
@@ -38,7 +38,7 @@ stop() {
     RETVAL=$?
     echo
     if [ $RETVAL -eq 0 ]; then
-        rm -f @LOCALSTATEDIR@/lock/subsys/$servicename
+        rm -f @localstatedir@/lock/subsys/$servicename
         rm -f @HALD_PID_FILE@
     fi
 }
@@ -61,7 +61,7 @@ case "$1" in
         start
         ;;
     condrestart)
-        if [ -f @LOCALSTATEDIR@/lock/subsys/$servicename ]; then
+        if [ -f @localstatedir@/lock/subsys/$servicename ]; then
             stop
 	    sleep 3
             start
diff --git a/hald/linux/Makefile.am b/hald/linux/Makefile.am
index 2ed2b278..9ee500d8 100644
--- a/hald/linux/Makefile.am
+++ b/hald/linux/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) -I.. \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index bc249a00..fef64a58 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
         -I$(top_srcdir) \
         @GLIB_CFLAGS@ @DBUS_CFLAGS@ @POLKIT_CFLAGS@
diff --git a/hald/linux/probing/Makefile.am b/hald/linux/probing/Makefile.am
index 1744d280..b081e485 100644
--- a/hald/linux/probing/Makefile.am
+++ b/hald/linux/probing/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @VOLUME_ID_CFLAGS@
diff --git a/hald/solaris/Makefile.am b/hald/solaris/Makefile.am
index d90beb7b..36f5a78b 100644
--- a/hald/solaris/Makefile.am
+++ b/hald/solaris/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) -I.. \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
diff --git a/hald/solaris/addons/Makefile.am b/hald/solaris/addons/Makefile.am
index 87ce5500..5c194d86 100644
--- a/hald/solaris/addons/Makefile.am
+++ b/hald/solaris/addons/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
         -I$(top_srcdir) -I$(top_srcdir)/hald -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
         @GLIB_CFLAGS@ @DBUS_CFLAGS@
diff --git a/hald/solaris/probing/Makefile.am b/hald/solaris/probing/Makefile.am
index b3c94ff1..d57f73b5 100644
--- a/hald/solaris/probing/Makefile.am
+++ b/hald/solaris/probing/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) -I$(top_srcdir)/hald -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
diff --git a/libhal-storage/Makefile.am b/libhal-storage/Makefile.am
index 4d5b93d8..6085d2fa 100644
--- a/libhal-storage/Makefile.am
+++ b/libhal-storage/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/libhal \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	@DBUS_CFLAGS@
 
 lib_LTLIBRARIES=libhal-storage.la
diff --git a/libhal/Makefile.am b/libhal/Makefile.am
index e3ae82f3..a98416ef 100644
--- a/libhal/Makefile.am
+++ b/libhal/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	@DBUS_CFLAGS@
 
 lib_LTLIBRARIES=libhal.la
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1a8347b6..2eba2cd6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
 	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@