summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-03-22 22:41:58 +0000
committerJoão Valverde <j@v6e.pt>2016-03-23 02:33:56 +0000
commit759fc8cf705fba74aabb6df59c916efe7204898a (patch)
treedb34040f10ce02d7697795609e548453577586f9 /Makefile.am
parentc57b3777f814f4f4108abcf111ee873acb60a91c (diff)
downloadwireshark-759fc8cf705fba74aabb6df59c916efe7204898a.tar.gz
Rename 'aclocal-fallback' directory to 'm4'
Change-Id: Icac1c43264b6c6fd426d3c5146863a491b48b4ff Reviewed-on: https://code.wireshark.org/review/14569 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 57af9bf0b9..b2df0eb0b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ include ./Makefile.am.inc
AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
# Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS
# in configure.ac in sync, otherwise there will be an error running autogen.sh.
-ACLOCAL_AMFLAGS = -I ./aclocal-fallback
+ACLOCAL_AMFLAGS = -I m4
# Common headers
COMMONCPPFLAGS =
@@ -703,13 +703,13 @@ EXTRA_DIST = \
README.vmware \
README.windows \
abi-descriptor.template \
- aclocal-fallback/ax_append_flag.m4 \
- aclocal-fallback/ax_check_compile_flag.m4 \
- aclocal-fallback/ax_compiler_vendor.m4 \
- aclocal-fallback/ax_prog_cc_for_build.m4 \
- aclocal-fallback/libsmi.m4 \
- aclocal-fallback/libgcrypt.m4 \
- aclocal-fallback/pkg.m4 \
+ m4/ax_append_flag.m4 \
+ m4/ax_check_compile_flag.m4 \
+ m4/ax_compiler_vendor.m4 \
+ m4/ax_prog_cc_for_build.m4 \
+ m4/libsmi.m4 \
+ m4/libgcrypt.m4 \
+ m4/pkg.m4 \
autogen.sh \
capinfos.c \
captype.c \