.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c85dadd6ef4a57f7731b6e02990344d1e19709e5..581dcb98c0800b412872c363bb019654591400f2 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.28 from Makefile.am
+# Makefile.in generated automatically by automake 0.29 from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -30,22 +30,26 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
+top_builddir = ..
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-TEXINFOS = fileutils.texi
+info_TEXINFOS = fileutils.texi
 DIST_OTHER = perm.texi getdate.texi
+CONFIG_HEADER = ../config.h
 
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 INFOS = fileutils.info*
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
+TEXINFOS = fileutils.texi
 
-DIST_COMMON = Makefile.am mdate-sh Makefile.in texinfo.tex stamp-vti \
+DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
 version.texi
 
 
@@ -62,25 +66,25 @@ default: all
 $(srcdir)/Makefile.in: Makefile.am
        cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: ../config.status Makefile.in
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+Makefile: $(top_builddir)/config.status Makefile.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 version.texi: stamp-vti
 
 stamp-vti: fileutils.texi $(top_srcdir)/configure.in
        echo "@set UPDATED `cd $(srcdir) && $(SHELL) mdate-sh fileutils.texi`" \
-         > version.tmp
-       echo "@set EDITION $(VERSION)" >> version.tmp
-       echo "@set VERSION $(VERSION)" >> version.tmp
-       if cmp -s version.tmp $(srcdir)/version.texi; then \
-         rm version.tmp;                       \
+         > vti.tmp
+       echo "@set EDITION $(VERSION)" >> vti.tmp
+       echo "@set VERSION $(VERSION)" >> vti.tmp
+       if cmp -s vti.tmp $(srcdir)/version.texi; then \
+         rm vti.tmp;                   \
        else                                    \
-         mv version.tmp $(srcdir)/version.texi; \
+         mv vti.tmp $(srcdir)/version.texi; \
        fi
        echo timestamp > $(srcdir)/stamp-vti
 
 mostlyclean-vti:
-       rm -f version.tmp
+       rm -f vti.tmp
 
 clean-vti:
 
@@ -88,6 +92,7 @@ distclean-vti:
 
 maintainer-clean-vti:
        rm -f stamp-vti version.texi
+
 fileutils.info: fileutils.texi version.texi
 
 
@@ -100,10 +105,8 @@ fileutils.info: fileutils.texi version.texi
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
        for file in $(INFO_DEPS); do            \
-         if [ -r ./$$file ]; then dir=.; else dir=$(srcdir); fi; \
-         for ifile in $$dir/$$file*; do        \
-           basename=`echo $$ifile|sed 's,.*/,,'`; \
-           $(INSTALL_DATA) $$dir/$$ifile $(infodir)/$$basename; \
+         for ifile in `cd $(srcdir) && echo $$file*`; do \
+           $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
          done;                                 \
        done
 
@@ -114,8 +117,8 @@ uninstall-info:
 
 mostlyclean-info:
        rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi \
-         fileutils.fn fileutils.fns fileutils.ky fileutils.log \
-         fileutils.pg fileutils.toc fileutils.tp fileutils.vr fileutils.op
+         fileutils.fn fileutils.fns fileutils.ky fileutils.log fileutils.pg \
+         fileutils.toc fileutils.tp fileutils.vr fileutils.op
 
 clean-info:
 
@@ -128,9 +131,9 @@ TAGS:
 
 
 subdir = doc
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist: $(DEP_DISTFILES)
-       @for file in $(DISTFILES); do           \
+       @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
          test -f $(distdir)/$$file \
          || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $(srcdir)/$$file $(distdir)/$$file; \

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 219a57e298302f41b36c46f1f4c75450a62b13c6..00e865441b544e83d72a4cf274ae06fcaf37ba2e 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.28 from Makefile.am
+# Makefile.in generated automatically by automake 0.29 from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -30,6 +30,8 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
+top_builddir = ..
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,8 +59,8 @@ HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h getopt.h \
 group-member.h long-options.h makepath.h modechange.h mountlist.h \
 obstack.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
 
-CONFIG_HEADER = ../config.h
 BUILT_SOURCES = getdate.c posixtm.c
+CONFIG_HEADER = ../config.h
 LIBRARIES = $(noinst_LIBRARIES)
 
 noinst_LIBFILES = libfu.a
@@ -85,7 +87,8 @@ LIBFILES =  libfu.a
 
 AR = ar
 RANLIB = @RANLIB@
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in alloca.c fileblocks.c fnmatch.c \
+fsusage.c ftruncate.c mountlist.c
 
 
 PACKAGE = @PACKAGE@
@@ -95,15 +98,16 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
        $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER) $(DATA)
 DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
        $(TEXINFOS) $(INFO_DEPS) $(MANS) $(DIST_OTHER) $(DATA)
-DEP_FILES = .deps/argmatch.P .deps/backupfile.P .deps/basename.P \
-.deps/dirname.P .deps/error.P .deps/fileblocks.P .deps/filemode.P \
+DEP_FILES = .deps/alloca.P .deps/argmatch.P .deps/backupfile.P \
+.deps/basename.P .deps/dirname.P .deps/error.P .deps/fileblocks.P \
+.deps/filemode.P .deps/fnmatch.P .deps/fsusage.P .deps/ftruncate.P \
 .deps/full-write.P .deps/getdate.P .deps/getopt.P .deps/getopt1.P \
 .deps/getversion.P .deps/group-member.P .deps/idcache.P .deps/isdir.P \
 .deps/long-options.P .deps/makepath.P .deps/modechange.P \
-.deps/obstack.P .deps/posixtm.P .deps/safe-read.P .deps/save-cwd.P \
-.deps/savedir.P .deps/stripslash.P .deps/userspec.P .deps/xgetcwd.P \
-.deps/xmalloc.P .deps/xstrdup.P .deps/xstrtol.P .deps/xstrtoul.P \
-.deps/yesno.P
+.deps/mountlist.P .deps/obstack.P .deps/posixtm.P .deps/safe-read.P \
+.deps/save-cwd.P .deps/savedir.P .deps/stripslash.P .deps/userspec.P \
+.deps/xgetcwd.P .deps/xmalloc.P .deps/xstrdup.P .deps/xstrtol.P \
+.deps/xstrtoul.P .deps/yesno.P
 SOURCES = $(fu_SOURCES)
 OBJECTS = $(fu_OBJECTS)
 
@@ -113,8 +117,8 @@ default: all
 $(srcdir)/Makefile.in: Makefile.am
        cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: ../config.status Makefile.in
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+Makefile: $(top_builddir)/config.status Makefile.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 mostlyclean-noinstLIBRARIES:
 
@@ -144,7 +148,7 @@ libfu.a: $(fu_OBJECTS) $(fu_LIBADD)
        $(AR) cru libfu.a $(fu_OBJECTS) $(fu_LIBADD)
        $(RANLIB) libfu.a
 
-ID:    $(HEADERS) $(SOURCES)
+ID: $(HEADERS) $(SOURCES)
        here=`pwd` && cd $(srcdir) && mkid -f $$here/ID $(SOURCES) $(HEADERS)
 
 tags: TAGS
@@ -162,9 +166,9 @@ distclean-tags:
 maintainer-clean-tags:
 
 subdir = lib
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist: $(DEP_DISTFILES)
-       @for file in $(DISTFILES); do           \
+       @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
          test -f $(distdir)/$$file \
          || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $(srcdir)/$$file $(distdir)/$$file; \
@@ -187,11 +191,12 @@ $(DEP_FILES): .deps/.P
 .deps/%.P: %.c
        @echo "mkdeps $< > $@"
        @test $(srcdir) = . \
-           && re=s/x/x/ \
-    || re=`echo 's,^$(srcdir)/*,,g;s, $(srcdir)/*, ,g' | sed 's,\.,\\\\.,g'`; \
+         && re=s/x/x/ \
+         || re=`echo 's,^$(srcdir)/*,,g;s, $(srcdir)/*, ,g' | sed 's,\.,\\\\.,g'`; \
          $(MKDEP) $< | sed "$$re" > $@-tmp
        @if test -n "$o"; then                  \
          sed 's/\.o:/$$o:/' $@-tmp > $@;       \
+         rm $@-tmp;                            \
        else                                    \
          mv $@-tmp $@;                         \
        fi