Install m4 macros into default $datadir/aclocal

Install the m4 macros in location where autoconf will find them by
default.

Adjust xdt-autogen to depend on the default location while still respect
any set ACLOCAL_FLAGS or XDT_ACLOCAL_FLAGS.

1 files changed, 1 insertions, 14 deletions

diff --git a/scripts/xdt-autogen.in b/scripts/xdt-autogen.in
index 222ed3f..48adfa0 100644
--- a/scripts/xdt-autogen.in
+++ b/scripts/xdt-autogen.in
@@ -469,19 +469,6 @@ CONFIGURE_FLAGS="${XDT_CONFIGURE_FLAGS} $@"
 
 
 ##
-## Check for aclocal flags
-##
-XDT_ACLOCAL_FLAGS="${ACLOCAL_FLAGS} ${XDT_ACLOCAL_FLAGS}"
-for path in `echo "${XDG_DATA_DIRS}" | sed 's,:, ,g'`; do
-  if test -d "${path}/xfce4/dev-tools/m4macros"; then
-    XDT_ACLOCAL_FLAGS="${XDT_ACLOCAL_FLAGS} -I ${path}/xfce4/dev-tools/m4macros"
-  elif test -d "${path}/xfce4/dev-tools/m4"; then
-    XDT_ACLOCAL_FLAGS="${XDT_ACLOCAL_FLAGS} -I ${path}/xfce4/dev-tools/m4"
-  fi
-done
-
-
-##
 ## Do the real work(TM)
 ##
 for configure_ac_file in ${CONFIGURE_AC_FILES}; do
@@ -490,7 +477,7 @@ for configure_ac_file in ${CONFIGURE_AC_FILES}; do
   echo "Preparing package directory ${source_dir}..."
 
   # set aclocal flags
-  ACLOCAL_FLAGS="${XDT_ACLOCAL_FLAGS}"
+  ACLOCAL_FLAGS="${ACLOCAL_FLAGS} ${XDT_ACLOCAL_FLAGS}"
   if test -d "${source_dir}/m4macros"; then
     ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I ${source_dir}/m4macros";
   fi