merge with 3.8.4c

diff --git a/lib/Makefile.in b/lib/Makefile.in
index d240f56..8728ebd 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -23,7 +23,7 @@ VPATH = @srcdir@
 CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
-DEFS = -DMVDIR="\"$(libdir)/mvdir\"" @DEFS@
+DEFS = -DCONFIG_BROKETS @DEFS@
 CFLAGS = @CFLAGS@
 YACC = @YACC@
 
@@ -105,7 +105,11 @@ posixtm.c: posixtm.y getdate.c
        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
index cb94429..e6956ee 100644 (file)
--- 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
index 8e365ed..cb53eb4 100644 (file)
--- 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
index 863b25e..df1706c 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -18,8 +18,8 @@ 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 ).  */
+   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
index 7f7a4a7..96860eb 100644 (file)
--- 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
index 9e70ed7..bb6a09c 100644 (file)
--- 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
index 8c1e9ec..fc93267 100644 (file)
--- 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"