Ship m4-local from top-level Makefile rather than recursing for two stupid files.

svn path=/trunk/; revision=4210

diff --git a/Makefile.am b/Makefile.am
index aff544ed0997115e59d414abf8148a3d9bbd6aca..f960dc72cfe7836136cb66065df8429379545cb0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for fetchmail
 
-SUBDIRS=               m4 m4-local po
+SUBDIRS=               m4 po
 
 AM_CFLAGS=             @CEFLAGS@
 AM_CPPFLAGS=           @CPFLAGS@
@@ -79,7 +79,8 @@ DISTDOCS=     BUGS FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 distdirs = rh-config contrib beos
 
 EXTRA_DIST= $(DISTDOCS) fetchmail.spec $(distdirs) ucs/README.svn \
-           trio/CHANGES trio/README strlcpy.3
+           trio/CHANGES trio/README strlcpy.3 \
+           m4-local/ac-archive-license.txt m4-local/ac_ma_search_package.m4
 
 FAQ: fetchmail-FAQ.html
        AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }

diff --git a/configure.ac b/configure.ac
index f6bde8b7b48008d7510007ddf9a6f506e0b341ce..9e54d9f5eead1791957c0062c6e31b09d8e196e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -743,7 +743,7 @@ if test "$needtrio" = 1 ; then
 fi
 dnl ----------------------------------------------------------------'
 
-AC_CONFIG_FILES([Makefile m4/Makefile m4-local/Makefile
+AC_CONFIG_FILES([Makefile m4/Makefile
                 po/Makefile.in])
 AC_OUTPUT
 

diff --git a/m4-local/Makefile.am b/m4-local/Makefile.am
deleted file mode 100644 (file)
index 2c4cd38..0000000
--- a/m4-local/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST=ac_ma_search_package.m4 \
-          ac-archive-license.txt