patch to use new 'configmake' module, plus .cvsignore changes

[Paul Eggert]

I installed this:

2006-08-25  Paul Eggert  <address@hidden>

        * .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.

--- .cvsignore  23 Aug 2006 18:37:27 -0000      1.10
+++ .cvsignore  25 Aug 2006 23:30:19 -0000
@@ -10,4 +10,4 @@ THANKS-to-translators
 aclocal.m4
 config.status
 configure
-stamp-h1
+coreutils-*
--- bootstrap.conf      22 Aug 2006 19:36:23 -0000      1.3
+++ bootstrap.conf      25 Aug 2006 23:30:20 -0000
@@ -38,7 +38,7 @@ gnulib_modules="
        $avoided_gnulib_modules
        $obsolete_gnulib_modules
        acl alloca argmatch assert backupfile base64 c-strtod
-       c-strtold calloc canon-host canonicalize chown cloexec
+       c-strtold calloc canon-host canonicalize chown cloexec configmake
        closeout cycle-check d-ino d-type diacrit dirfd dirname dup2
        error euidaccess exclude exitfail fcntl-safer fdl file-type
        fileblocks filemode filenamecat fnmatch-gnu fopen-safer
@@ -56,7 +56,7 @@ gnulib_modules="
        stat-time stdbool stdint stdlib-safer stpcpy strcase strftime
        strpbrk strtoimax strtoumax strverscmp timespec tzset
        unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
-       uptime userspec utimecmp utimens vasprintf version-etc-fsf
+       uptime userspec utimecmp utimens vasprintf verify version-etc-fsf
        wcwidth winsz-ioctl winsz-termios xalloc xgetcwd xgethostname
        xmemcoll xnanosleep xreadlink xstrtod xstrtoimax xstrtol
        xstrtold xstrtoumax yesno
--- lib/.cvsignore      23 Aug 2006 18:37:27 -0000      1.33
+++ lib/.cvsignore      25 Aug 2006 23:30:20 -0000
@@ -43,6 +43,7 @@ closeout.h
 config.charset
 config.h
 config.hin
+configmake.h
 creat-safer.c
 cycle-check.c
 cycle-check.h
@@ -264,6 +265,7 @@ sig2str.h
 snprintf.c
 snprintf.h
 socket_.h
+stamp-h1
 stat-macros.h
 stat-time.h
 stat_.h
Index: src/.cvsignore
===================================================================
RCS file: /fetish/cu/src/.cvsignore,v
retrieving revision 1.15
diff -p -u -r1.15 .cvsignore
--- src/.cvsignore      22 Aug 2006 18:50:28 -0000      1.15
+++ src/.cvsignore      25 Aug 2006 23:30:23 -0000
@@ -42,7 +42,6 @@ join
 kill
 link
 ln
-localedir.h
 logname
 ls
 md5sum
--- src/Makefile.am     23 Aug 2006 18:37:28 -0000      1.73
+++ src/Makefile.am     25 Aug 2006 23:30:23 -0000
@@ -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=
 
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
-localedir = $(datadir)/locale
-BUILT_SOURCES = localedir.h
-DISTCLEANFILES = localedir.h
-localedir.h:
-       @rm -f $@ address@hidden
-       echo '#define LOCALEDIR "$(localedir)"' >address@hidden
-       @chmod a-w address@hidden
-       mv address@hidden $@
-
 BUILT_SOURCES += dircolors.h
 dircolors.h: dcgen dircolors.hin
        @rm -f $@ address@hidden
--- src/system.h        23 Aug 2006 19:14:25 -0000      1.154
+++ src/system.h        25 Aug 2006 23:30:23 -0000
@@ -55,7 +55,9 @@ you must include <sys/types.h> before in
 #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>