diff options
author | Matthias Andree <matthias.andree@gmx.de> | 2005-07-31 14:16:34 +0000 |
---|---|---|
committer | Matthias Andree <matthias.andree@gmx.de> | 2005-07-31 14:16:34 +0000 |
commit | 94e2792107a1a871660604e4aa8c5e2f3dda29c1 (patch) | |
tree | 1e5cee5ed53c4af4fa9da413f8be47343b271a53 | |
parent | cc2cad965d93b5b4e4c39081cee0bafd04a0ff0e (diff) | |
download | fetchmail-94e2792107a1a871660604e4aa8c5e2f3dda29c1.tar.gz fetchmail-94e2792107a1a871660604e4aa8c5e2f3dda29c1.tar.bz2 fetchmail-94e2792107a1a871660604e4aa8c5e2f3dda29c1.zip |
Ship m4-local from top-level Makefile rather than recursing for two stupid files.
svn path=/trunk/; revision=4210
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | m4-local/Makefile.am | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index aff544ed..f960dc72 100644 --- 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 f6bde8b7..9e54d9f5 100644 --- 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 index 2c4cd385..00000000 --- a/m4-local/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST=ac_ma_search_package.m4 \ - ac-archive-license.txt |