# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 750457449 0
# Node ID c74e20573782fb508e8614dc61ddc30a66b40f0f
# Parent  539738c0b6c24ae66c1235ee739b1cc5dedc1c85
merge with 3.8.4c

diff --git a/lib/Makefile.in b/lib/Makefile.in
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -23,7 +23,7 @@
 CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
-DEFS = -DMVDIR="\"$(libdir)/mvdir\"" @DEFS@
+DEFS = -DCONFIG_BROKETS @DEFS@
 CFLAGS = @CFLAGS@
 YACC = @YACC@
 
@@ -105,7 +105,11 @@
 	mv tposixtm.c posixtm.c
 	rm -f posixtm.tab.c
 
-$(OBJECTS): config.h
+rename.o: rename.c
+	$(CC) -c $(CPPFLAGS) -DMVDIR="\"$(libdir)/mvdir\"" $(DEFS) \
+	    -I.. -I$(srcdir) $(CFLAGS) $(srcdir)/rename.c
+
+$(OBJECTS): $(srcdir)/../config.h
 
 backupfile.o getversion.o: backupfile.h
 fnmatch.o: fnmatch.h
diff --git a/lib/backupfile.c b/lib/backupfile.c
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -21,8 +21,8 @@
 #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 ).  */
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
 #else
 #include "config.h"
diff --git a/lib/dirname.c b/lib/dirname.c
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -18,8 +18,8 @@
 #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 ).  */
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
 #else
 #include "config.h"
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -18,8 +18,8 @@
 #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 ).  */
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
 #else
 #include "config.h"
diff --git a/lib/fsusage.c b/lib/fsusage.c
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -18,8 +18,8 @@
 #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 ).  */
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
 #else
 #include "config.h"
diff --git a/lib/makepath.c b/lib/makepath.c
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -21,8 +21,8 @@
 #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 ).  */
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
 #else
 #include "config.h"
diff --git a/lib/userspec.c b/lib/userspec.c
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -20,8 +20,8 @@
 #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 ).  */
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
 #else
 #include "config.h"