diff options
| author | Jim Meyering <jim@meyering.net> | 1993-10-12 04:30:50 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-10-12 04:30:50 +0000 |
| commit | 9cfcec5b05d51fd2b2d72adb283b327b08ce868d (patch) | |
| tree | 804cf6fa977729fd4a77e7a49b03174ec8297581 /lib | |
| parent | d463bda0668397cf570d6ca3c1f72dc1110eef43 (diff) | |
| download | coreutils-9cfcec5b05d51fd2b2d72adb283b327b08ce868d.tar.xz | |
merge with 3.8.4b
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.in | 4 | ||||
| -rw-r--r-- | lib/fnmatch.c | 7 | ||||
| -rw-r--r-- | lib/makepath.c | 11 |
3 files changed, 10 insertions, 12 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index cbf2bd678..d240f568e 100644 --- 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 2fb65b521..863b25e9e 100644 --- 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 be5f8c347..9e70ed72c 100644 --- 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> |