A couple of easy fixes I noticed while working on other things.
2006-07-06 Eric Blake <[EMAIL PROTECTED]>
* Makefile.am (SUBDIRS): Build . before src, so that autoheader
runs first when needed.
* doc/Makefile.am (m4.1): Backport rule from CVS head: build m4.1
once in srcdir rather than multiple times in VPATH builds.
Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.25.2.6
diff -u -r1.25.2.6 Makefile.am
--- Makefile.am 2 Jul 2006 01:34:24 -0000 1.25.2.6
+++ Makefile.am 6 Jul 2006 18:05:01 -0000
@@ -20,7 +20,7 @@
##
## Written by Gary V. Vaughan <[EMAIL PROTECTED]>
-SUBDIRS = examples lib src doc checks
+SUBDIRS = . examples lib src doc checks
EXTRA_DIST = bootstrap c-boxes.el GNUmakefile Makefile.maint \
m4/gnulib-cache.m4
DISTCLEANFILES = stamp-h
Index: doc/Makefile.am
===================================================================
RCS file: /sources/m4/m4/doc/Attic/Makefile.am,v
retrieving revision 1.8.2.3
diff -u -r1.8.2.3 Makefile.am
--- doc/Makefile.am 7 Jun 2006 18:46:42 -0000 1.8.2.3
+++ doc/Makefile.am 6 Jul 2006 18:05:01 -0000
@@ -27,9 +27,17 @@
# Depend on configure.ac for version, m4.c for usage text. Do not depend on
# built m4 executable, since not everyone has help2man or perl.
-m4.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/m4.c
+# Build the man page once in the srcdir, rather than in every VPATH build
+# dir, to match how automake builds info pages. This is safe for 'make
+# distcheck' since it is distributed pre-built.
+$(srcdir)/m4.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/m4.c
@if test -x ../src/m4$(EXEEXT) ; then \
echo "Updating man page m4.1" ; \
$(SHELL) $(top_srcdir)/missing --run \
- help2man -o m4.1 ../src/m4$(EXEEXT) ; \
+ help2man -o [EMAIL PROTECTED] ../src/m4$(EXEEXT) ; \
+ cmp -s [EMAIL PROTECTED] $@ || cp [EMAIL PROTECTED] $@; \
+ rm -f [EMAIL PROTECTED]; \
+ else \
+ echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
+ echo " Retry once the program executable is ready."; \
fi
_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches
