diff options
| -rw-r--r-- | lib/Makefile.in | 4 | ||||
| -rw-r--r-- | lib/fnmatch.c | 7 | ||||
| -rw-r--r-- | lib/makepath.c | 11 | ||||
| -rw-r--r-- | old/fileutils/ChangeLog | 19 | ||||
| -rw-r--r-- | src/df.c | 1 | ||||
| -rw-r--r-- | src/ls.c | 2 |
6 files changed, 30 insertions, 14 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> diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index deab9f84e..d1d7c3ca7 100644 --- a/old/fileutils/ChangeLog +++ b/old/fileutils/ChangeLog @@ -1,3 +1,18 @@ +Sun Oct 10 13:38:54 1993 Jim Meyering (meyering@comco.com) + + * src/Makefile.in (dist): Depend on $(DISTFILES). + + * src/Makefile.in [libdir, LIBPROGS]: Define them. + From Francois Pinard. + + * posixtm.y: [HAVE_CONFIG_H, CONFIG_BROKETS]: Include <config.h> + or "config.h". From Francois Pinard. + + * makepath.c: [HAVE_CONFIG_H, CONFIG_BROKETS]: Remove the duplicate + #ifdef block following the alloca #ifdefs. From Francois Pinard. + + * df.c: Remove unnecessary dcl of strstr. + Sat Oct 9 13:30:28 1993 Jim Meyering (meyering@comco.com) * configure.in [STATFS_OSF1]: Change name to STAT_STATFS3_OSF1 @@ -15,6 +30,10 @@ Sat Oct 9 13:30:28 1993 Jim Meyering (meyering@comco.com) * ls.c (usage): Split long usage string between two fprintf statements to avoid default limit of SGI's cc on string length. + * Makefile.in, src/Makefile.in [PROGS]: Alphabetize. + + * configure.in: Remove AC_UNISTD_H; add unistd.h to AC_HAVE_HEADERS. + Thu Oct 07 12:57:10 1993 Jim Meyering (meyering@comco.com) * chgrp.c, chmod.c, chown.c, cp-aux.c, cp.c, dd.c, df.c, du.c, @@ -51,7 +51,6 @@ #include "system.h" #include "version.h" -char *strstr (); char *xmalloc (); char *xstrdup (); void error (); @@ -267,7 +267,7 @@ static int numeric_users; static int print_block_size; /* Nonzero means show file sizes in kilobytes instead of blocks - (the size of which is system-dependant). -k */ + (the size of which is system-dependent). -k */ static int kilobyte_blocks; |