From 4dc1f7070bfc8d8fced461d760874b79d1ec6c6c Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 14 Jun 1997 16:36:22 +0000
Subject: [PATCH] .

---
 doc/Makefile.in      |  4 ++--
 lib/Makefile.in      |  3 +--
 m4/Makefile.in       | 15 +++++----------
 tests/ls/Makefile.in |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3ad665abe..8a65867ba 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -120,7 +120,7 @@ default: all
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -254,7 +254,7 @@ distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits doc/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6d7f4d8eb..6a5fa2024 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -246,8 +246,7 @@ MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
 -include .deps/.P
 .deps/.P: $(BUILT_SOURCES)
-	test -d .deps || mkdir .deps
-	echo > $@
+	test -d .deps || { mkdir .deps;echo > $@; }
 
 -include $(DEP_FILES)
 
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 9660110c1..42ec25845 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -62,35 +62,30 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
+DF_PROG = @DF_PROG@
 GENCAT = @GENCAT@
-GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LN = @LN@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NEED_SETGID = @NEED_SETGID@
-OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
-OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
+MV = @MV@
+MVDIR_PROG = @MVDIR_PROG@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
-POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
-SEQ_LIBM = @SEQ_LIBM@
-SQRT_LIBM = @SQRT_LIBM@
+RM = @RM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 5c70f509e..a607bded5 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -122,7 +122,7 @@ default: all
 .SUFFIXES:
 .SUFFIXES: .pl
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/ls/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/ls/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -140,7 +140,7 @@ distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/ls/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/ls/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \