merge with 3.8.4b

diff --git a/lib/Makefile.in b/lib/Makefile.in
index cbf2bd678e188b043a86a9d6872c154d5179e9e5..d240f568e5fa5d87a30933a97bf33e2011db5843 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -76,7 +76,7 @@ distclean: clean
 realclean: distclean
        rm -f TAGS
 
-dist:
+dist: $(DISTFILES)
        for file in $(DISTFILES); do \
          ln $$file ../`cat ../.fname`/lib \
            || cp -p $$file ../`cat ../.fname`/lib; \
@@ -105,6 +105,8 @@ posixtm.c: posixtm.y getdate.c
        mv tposixtm.c posixtm.c
        rm -f posixtm.tab.c
 
+$(OBJECTS): config.h
+
 backupfile.o getversion.o: backupfile.h
 fnmatch.o: fnmatch.h
 fsusage.o: fsusage.h

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 2fb65b521604bf4306e494cdcfd1d31755bbc941..863b25e9e9c52192f3c34b08ca42055bd32808e6 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -16,7 +16,14 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
 #include <config.h>
+#else
+#include "config.h"
+#endif
 #endif
 
 #include <errno.h>

diff --git a/lib/makepath.c b/lib/makepath.c
index be5f8c34718fbb45b7b276aa5890e6c271fbfc3a..9e70ed72c660a57c1ac7b2982aec2b5b011fb2cb 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -43,17 +43,6 @@ char *alloca ();
 #endif
 #endif
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I will use ./config.h rather than /config.h
-   (which it would do because it found this file in ).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
-#endif
-
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>