From a89ae060ff117b21f797a78ac9e4004164266694 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 12 Oct 1993 20:24:09 +0000 Subject: [PATCH] merge with 3.8.4c --- lib/Makefile.in | 8 ++++++-- lib/backupfile.c | 4 ++-- lib/dirname.c | 4 ++-- lib/fnmatch.c | 4 ++-- lib/fsusage.c | 4 ++-- lib/makepath.c | 4 ++-- lib/userspec.c | 4 ++-- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index d240f568e..8728ebdba 100644 --- 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 cb9442903..e6956ee2a 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -21,8 +21,8 @@ #ifdef HAVE_CONFIG_H #if defined (CONFIG_BROKETS) /* We use 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 #else #include "config.h" diff --git a/lib/dirname.c b/lib/dirname.c index 8e365ed92..cb53eb406 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -18,8 +18,8 @@ #ifdef HAVE_CONFIG_H #if defined (CONFIG_BROKETS) /* We use 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 #else #include "config.h" diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 863b25e9e..df1706cc0 100644 --- 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 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 #else #include "config.h" diff --git a/lib/fsusage.c b/lib/fsusage.c index 7f7a4a7cd..96860ebc5 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -18,8 +18,8 @@ #ifdef HAVE_CONFIG_H #if defined (CONFIG_BROKETS) /* We use 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 #else #include "config.h" diff --git a/lib/makepath.c b/lib/makepath.c index 9e70ed72c..bb6a09c12 100644 --- a/lib/makepath.c +++ b/lib/makepath.c @@ -21,8 +21,8 @@ #ifdef HAVE_CONFIG_H #if defined (CONFIG_BROKETS) /* We use 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 #else #include "config.h" diff --git a/lib/userspec.c b/lib/userspec.c index 8c1e9ec8e..fc93267f8 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -20,8 +20,8 @@ #ifdef HAVE_CONFIG_H #if defined (CONFIG_BROKETS) /* We use 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 #else #include "config.h" -- 2.11.0