.

2 files changed, 26 insertions, 21 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 42fd40b9c..cdc36d98a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1e from Makefile.am
+# Makefile.in generated automatically by automake 1.1f from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -53,18 +53,17 @@ INFOS = fileutils.info fileutils.info[-0-9]*
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
-
-DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
+DIST_COMMON =  Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
 version.texi
 
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) $(DATA)
-DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) $(DATA)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+	$(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST)
+DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST)
 
 TAR = tar
 default: all
@@ -73,7 +72,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
 	cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: $(top_builddir)/config.status Makefile.in
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 version.texi: @MAINT@stamp-vti
@@ -125,10 +124,20 @@ install-info: $(INFO_DEPS)
 	    else : ; fi; \
 	  done; \
 	done
+	$(POST_INSTALL)
+	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  for file in $(INFO_DEPS); do \
+	    install-info --info-dir=$(infodir) $$file; :;\
+	  done; \
+	else : ; fi
 
 uninstall-info:
-	cd $(srcdir) && for file in *.info*; do	\
-	  rm -f $(infodir)/$$file; \
+	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  ii=yes; \
+	else ii=; fi; \
+	for file in $(INFO_DEPS); do \
+	  (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	  test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \
 	done
 
 mostlyclean-info:
@@ -157,13 +166,9 @@ distdir: $(DEP_DISTFILES)
 	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
 	done
 info: $(INFO_DEPS)
-
 dvi: $(DVIS)
-
 check: all
-
 installcheck:
-
 install-exec: 
 	$(NORMAL_INSTALL)
 
@@ -188,11 +193,11 @@ mostlyclean-generic:
 
 clean-generic:
 	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 distclean-generic:
 	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log $(CONFIG_HEADER) stamp-h
+	rm -f config.cache config.log stamp-h
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4cf28668c..55a95ad7c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -40,9 +40,9 @@ transform = @program_transform_name@
 
 noinst_LIBRARIES = fu
 
-EXTRA_DIST = alloca.c basename.c error.c euidaccess.c fnmatch.c fsusage.c \
-ftruncate.c getdate.y getline.c group-member.c memcmp.c memcpy.c memset.c \
-mkdir.c mktime.c mountlist.c obstack.c posixtm.y regex.c rx.c \
+EXTRA_DIST = basename.c euidaccess.c \
+getdate.y group-member.c memcpy.c memset.c \
+mkdir.c posixtm.y \
 rename.c rmdir.c rpmatch.c \
 stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
 
@@ -57,10 +57,11 @@ safe-read.c save-cwd.c savedir.c stripslash.c userspec.c xgetcwd.c \
 xmalloc.c xstrdup.c xstrtol.c xstrtoul.c yesno.c
 
 fu_LIBADD = @LIBOBJS@ @ALLOCA@
+fu_DEPENDENCIES = $(fu_LIBADD)
 
 noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
 getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
-mountlist.h obstack.h path-concat.h pathmax.h regex.h rx.h \
+mountlist.h path-concat.h pathmax.h \
 save-cwd.h xstrtol.h xstrtoul.h
 
 BUILT_SOURCES = getdate.c posixtm.c
@@ -75,7 +76,6 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-fu_DEPENDENCIES = 
 fu_OBJECTS =  getdate.o getopt.o getopt1.o posixtm.o argmatch.o \
 backupfile.o dirname.o filemode.o full-write.o getversion.o idcache.o \
 isdir.o long-options.o makepath.o modechange.o path-concat.o \