diff --git a/.gitignore b/.gitignore index db7a9fb8..e92300cf 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ depcomp install-sh libtool ltmain.sh +m4 make_slack missing Makefile.in diff --git a/ChangeLog b/ChangeLog index 15620318..3051b8cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14304,3 +14304,6 @@ * Amalgamated INCLUDE Makefile entries into AM_CPPFLAGS. * Added '-Wno-portability' to the invocation of 'automake' in 'autogen.sh'. +2014-08-14 Fred Gleason <fredg@paravelsystems.com> + * Added 'AC_CONFIG_MACRO_DIR' invocation in 'configure.ac'. + * Added a 'maintainer-clean-local' target in 'Makefile.am'. diff --git a/Makefile.am b/Makefile.am index d6b05004..91a9d4dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,11 @@ SUBDIRS = icons\ utils\ web +ACLOCAL_AMFLAGS = -I m4 + +maintainer-clean-local: + rm -rf m4 + install-exec-local: ./install-init.sh $(DESTDIR)$(prefix) diff --git a/configure.ac b/configure.ac index cde1f480..b0f0e328 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AC_INIT(rivendell,`cat PACKAGE_VERSION`,Fred Gleason <fredg@paravelsystems.com>) AM_INIT_AUTOMAKE(rivendell,`cat PACKAGE_VERSION`) AC_SUBST(RPM_RELEASE,1) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +AC_CONFIG_MACRO_DIR([m4]) # # Some Fully Resolved Install Paths