From ab94b6c3c2050099000d34d7f11ebc83e14ff8e6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 12 Oct 1993 20:12:59 +0000 Subject: [PATCH] GNU file utilities --- lib/Makefile.in | 8 ++++++-- lib/argmatch.c | 4 ++-- lib/backupfile.c | 4 ++-- lib/dirname.c | 4 ++-- lib/fileblocks.c | 4 ++-- lib/fnmatch.c | 4 ++-- lib/fsusage.c | 4 ++-- lib/ftruncate.c | 4 ++-- lib/getversion.c | 4 ++-- lib/idcache.c | 4 ++-- lib/isdir.c | 4 ++-- lib/makepath.c | 4 ++-- lib/mkdir.c | 4 ++-- lib/modechange.c | 4 ++-- lib/mountlist.c | 4 ++-- lib/rename.c | 4 ++-- lib/savedir.c | 4 ++-- lib/strdup.c | 4 ++-- lib/stripslash.c | 4 ++-- lib/userspec.c | 4 ++-- lib/xstrdup.c | 4 ++-- lib/yesno.c | 4 ++-- 22 files changed, 48 insertions(+), 44 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/argmatch.c b/lib/argmatch.c index 1994c935a..17e088b7e 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.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" 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/fileblocks.c b/lib/fileblocks.c index fad39de13..4c03a1782 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.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" 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/ftruncate.c b/lib/ftruncate.c index 3bf53fa89..bfd0ae5bf 100644 --- a/lib/ftruncate.c +++ b/lib/ftruncate.c @@ -4,8 +4,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/getversion.c b/lib/getversion.c index 0784edad9..78fda7540 100644 --- a/lib/getversion.c +++ b/lib/getversion.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" diff --git a/lib/idcache.c b/lib/idcache.c index ff52e0e75..bafae7483 100644 --- a/lib/idcache.c +++ b/lib/idcache.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/isdir.c b/lib/isdir.c index 76b79829d..2c75bec9b 100644 --- a/lib/isdir.c +++ b/lib/isdir.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/mkdir.c b/lib/mkdir.c index a5f623034..28c893265 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.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/modechange.c b/lib/modechange.c index 6b3c88e24..448ea7b00 100644 --- a/lib/modechange.c +++ b/lib/modechange.c @@ -27,8 +27,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/mountlist.c b/lib/mountlist.c index d68cf8dce..aaf28ea79 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.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/rename.c b/lib/rename.c index ca778e9ab..1502436f0 100644 --- a/lib/rename.c +++ b/lib/rename.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/savedir.c b/lib/savedir.c index 378fb4774..7080c8ecc 100644 --- a/lib/savedir.c +++ b/lib/savedir.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" diff --git a/lib/strdup.c b/lib/strdup.c index 40b2df603..cc0db6f6a 100644 --- a/lib/strdup.c +++ b/lib/strdup.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/stripslash.c b/lib/stripslash.c index bccbdeb0a..5f4036411 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.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/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" diff --git a/lib/xstrdup.c b/lib/xstrdup.c index d422fcadd..4c5749e02 100644 --- a/lib/xstrdup.c +++ b/lib/xstrdup.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/yesno.c b/lib/yesno.c index 6eca9dd59..5e413ec07 100644 --- a/lib/yesno.c +++ b/lib/yesno.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" -- 2.11.0