X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2FMakefile.in;h=182f39c9cd89e8cbbe486329f7257ff139a492f2;hb=cffbc793a1a9291ed6b09d401a4c3816847a656c;hp=cc72afb1c471ba87e8adff014ffcfa669a5f86ec;hpb=f8169cd8ffc2d605f2d5dc92764804fbca077642;p=gnulib.git

diff --git a/m4/Makefile.in b/m4/Makefile.in
index cc72afb1c..182f39c9c 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -57,6 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
 AMDEP = @AMDEP@
@@ -70,6 +72,7 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
@@ -91,20 +94,15 @@ MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-<<<<<<< Makefile.in
 NEED_SETGID = @NEED_SETGID@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
-=======
-NEED_SETGID = @NEED_SETGID@
->>>>>>> 1.216
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
-SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
@@ -124,10 +122,11 @@ check-decl.m4 \
 chown.m4 \
 d-ino.m4 \
 d-type.m4 \
-decl.m4 \
 error.m4 \
 fnmatch.m4 \
 fstypename.m4 \
+fsusage.m4 \
+ftruncate.m4 \
 getgroups.m4 \
 getline.m4 \
 getloadavg.m4 \
@@ -144,6 +143,7 @@ jm-winsz2.m4 \
 largefile.m4 \
 lchown.m4 \
 lcmessage.m4 \
+lib-check.m4 \
 link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat-slash.m4 \
@@ -206,7 +206,6 @@ distdir: $(DISTFILES)
 	    cp -pR $$d/$$file $(distdir); \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done