.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index a68bd76707ea565c964e0be9af395056ec9fc175..3ad665abe3359ba089d4542c636f3ee83d3c7418 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1o from Makefile.am
+# Makefile.in generated automatically by automake 1.1p from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -199,7 +199,7 @@ install-info-am: $(INFO_DEPS)
          done; \
        done
        @$(POST_INSTALL)
-       @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+       @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
          for file in $(INFO_DEPS); do \
            echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
            install-info --info-dir=$(infodir) $(infodir)/$$file; :;\
@@ -208,7 +208,7 @@ install-info-am: $(INFO_DEPS)
 
 uninstall-info:
        $(PRE_UNINSTALL)
-       if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+       @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
          ii=yes; \
        else ii=; fi; \
        for file in $(INFO_DEPS); do \
@@ -249,9 +249,11 @@ TAGS:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = doc
+
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
-         && cd $(top_srcdir) \
+       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
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
@@ -259,7 +261,7 @@ distdir: $(DISTFILES)
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       $(MAKE) top_distdir="$(distdir)" distdir="$(distdir)" dist-info
+       $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
 info: $(INFO_DEPS)
 dvi: $(DVIS)
 check: all
@@ -292,20 +294,20 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h
+       rm -f config.cache config.log stamp-h stamp-h[0-9]*
        test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
        test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-vti mostlyclean-info mostlyclean-generic
+mostlyclean:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
 
-clean:  clean-vti clean-info clean-generic mostlyclean
+clean:  clean-vti clean-aminfo clean-generic mostlyclean
 
-distclean:  distclean-vti distclean-info distclean-generic clean
+distclean:  distclean-vti distclean-aminfo distclean-generic clean
        rm -f config.status
 
-maintainer-clean:  maintainer-clean-vti maintainer-clean-info \
+maintainer-clean:  maintainer-clean-vti maintainer-clean-aminfo \
                maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 72f02c59a753bc8e0c97841b06726274a9ce0dbe..28ec2eecee2124663f32b59d7e60a8f58a92b49f 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1o from Makefile.am
+# Makefile.in generated automatically by automake 1.1p from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -130,7 +130,7 @@ AR = ar
 YLWRAP = $(srcdir)/ylwrap
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(LDFLAGS) -o $@
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in alloca.c basename.c chown.c \
@@ -230,9 +230,11 @@ maintainer-clean-tags:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = lib
+
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
-         && cd $(top_srcdir) \
+       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 lib/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
@@ -260,10 +262,10 @@ distclean-depend:
 maintainer-clean-depend:
        rm -rf .deps
 
-.deps/%.P: $(srcdir)/%.c
+.deps/%.P: %.c
        @echo "Computing dependencies for $<..."
-       @o='o';                         \
-       test -n "$o" && o='$$o';        \
+       @o='o'; \
+       test -n "$o" && o='$$o'; \
        $(MKDEP) $< | sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," > $@
 info:
 dvi:
@@ -296,7 +298,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h
+       rm -f config.cache config.log stamp-h stamp-h[0-9]*
        test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 800aaea69ab95f2440346f7cbca0e47f31639f4f..42ec2584580c8bb099ca0a026c2e06a87970c941 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -76,7 +76,6 @@ LIBOBJS = @LIBOBJS@
 LN = @LN@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MV = @MV@

diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index d8fa6c157fcc7eaf2b3c4cea55a2431b8dd50de7..5c70f509e774fa7f9acb68fbb7803bef2fe9c83b 100644 (file)
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1o from Makefile.am
+# Makefile.in generated automatically by automake 1.1p from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -135,9 +135,11 @@ TAGS:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = tests/ls
+
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
-         && cd $(top_srcdir) \
+       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
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
@@ -198,7 +200,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h
+       rm -f config.cache config.log stamp-h stamp-h[0-9]*
        test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:

diff --git a/tests/ls/ls-tests b/tests/ls/ls-tests
index ad1844667182389878d2984dc68911bdaabef340..f726b42a9377d8f31ef00667d3ec63b8f685448c 100755 (executable)
--- a/tests/ls/ls-tests
+++ b/tests/ls/ls-tests
@@ -9,7 +9,7 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx -b $srcdir/'""""" "' $srcdir/b > q1.O 2> q1.E
+$xx -b  > q1.O 2> q1.E
 code=$?
 if test $code != 0 ; then
   $echo "Test q1 failed: ../../src/ls return code $code differs from expected value 0" 1>&2
@@ -26,7 +26,7 @@ else
   esac
 fi
 test -s q1.E || rm -f q1.E
-$xx -b -Q $srcdir/'""""" "' $srcdir/b > q2.O 2> q2.E
+$xx -b -Q  > q2.O 2> q2.E
 code=$?
 if test $code != 0 ; then
   $echo "Test q2 failed: ../../src/ls return code $code differs from expected value 0" 1>&2