diff options
| -rw-r--r-- | m4macros/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/xdt-autogen.in | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am index 51d473d..71fdd87 100644 --- a/m4macros/Makefile.am +++ b/m4macros/Makefile.am @@ -4,7 +4,7 @@ # Written for Xfce by Benedikt Meurer <benny@xfce.org>. # -macrodir = $(datadir)/xfce4/dev-tools/m4macros +macrodir = $(datadir)/aclocal macro_DATA = \ xdt-depends.m4 \ xdt-features.m4 \ 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 |