diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-25 23:30:57 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-25 23:30:57 +0000 |
| commit | 0d41cd8f2927d896f373fb6076c2508c9284a978 (patch) | |
| tree | b41b77a03b2af77b524ee64ba30cf1673f6aa092 /src | |
| parent | 1a5c74f01a6ed5469f7271d3d6a7e9c7a0e986ee (diff) | |
| download | coreutils-0d41cd8f2927d896f373fb6076c2508c9284a978.tar.xz | |
* .cvsignore: Remove stamp-h1. Add coreutils-*, to ignore
tarballs.
* bootstrap.conf: Add configmake, verify.
* lib/.cvsignore: Add configmake.h, stamp-h1.
* src/.cvsignore: Remove localedir.h.
* src/Makefile.am (localedir, DISTCLEANFILES, localedir.h): Remove;
subsumed by configmake.
* src/system.h: Include configmake.h rather than localedir.h
(LOCALEDIR): New macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/.cvsignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/system.h | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/.cvsignore b/src/.cvsignore index 9090f41bf..0b41f9232 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -42,7 +42,6 @@ join kill link ln -localedir.h logname ls md5sum diff --git a/src/Makefile.am b/src/Makefile.am index 8442b8e63..9b535f1de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,7 @@ noinst_HEADERS = \ EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \ groups.sh wheel-gen.pl extract-magic c99-to-c89.diff +BUILT_SOURCES = CLEANFILES = $(SCRIPTS) su AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/lib -I../lib @@ -203,15 +204,6 @@ sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) editpl = sed -e 's,@''PERL''@,$(PERL),g' -localedir = $(datadir)/locale -BUILT_SOURCES = localedir.h -DISTCLEANFILES = localedir.h -localedir.h: - @rm -f $@ $@-t - echo '#define LOCALEDIR "$(localedir)"' >$@-t - @chmod a-w $@-t - mv $@-t $@ - BUILT_SOURCES += dircolors.h dircolors.h: dcgen dircolors.hin @rm -f $@ $@-t diff --git a/src/system.h b/src/system.h index e395fbeae..29bd1be55 100644 --- a/src/system.h +++ b/src/system.h @@ -55,7 +55,9 @@ you must include <sys/types.h> before including this file #include <limits.h> #include "pathmax.h" -#include "localedir.h" + +#include "configmake.h" +#define LOCALEDIR CONFIGMAKE_LOCALEDIR #if TIME_WITH_SYS_TIME # include <sys/time.h> |