[Bug-gnulib] Re: stdbool.h.in

[Jim Meyering]

Bruno Haible <address@hidden> wrote:
> In gnulib/lib/ChangeLog I see the entry
>
> 2003-06-02  Jim Meyering  <address@hidden>
>
>       * stdbool.h.in: Rename to stdbool.hin.
>
> but the file is not renamed. Is this intentional?
> Do you wish me to rename it to stdbool_.h
> (as this is the convention that we have started using for alloca_.h,
> fnmatch_.h, poll_.h)? Together with the renaming I would also update
> modules/stdbool accordingly.

Oh!  Sorry about that.
I hadn't meant to check that in, yet.  So little time...
Your idea of renaming to stdbool_.h is better.
The point is to avoid having two `.'s.

Modulo that change, here's what I'd prepared.
What do you think?

2003-06-02  Jim Meyering  <address@hidden>

        * modules/stdbool: Reflect renaming: stdbool.h.in -> stdbool_.h.
        Adjust Makefile snippet not to redirect directly to target.
        Use $(STDBOOL_H) notation, not @STDBOOL_H@ for AC_REPLACE'd variables.

Index: stdbool
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/stdbool,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 stdbool
--- stdbool     20 Jan 2003 10:02:38 -0000      1.6
+++ stdbool     5 Jun 2003 15:52:26 -0000
@@ -3,7 +3,7 @@ An <stdbool.h> that nearly conforms to C
 (Nearly: casts to bool may not work.)
 
 Files:
-lib/stdbool.h.in
+lib/stdbool_.h
 m4/stdbool.m4
 
 Depends-on:
@@ -12,13 +12,13 @@ configure.ac:
 AM_STDBOOL_H
 
 Makefile.am:
-EXTRA_DIST += stdbool.h.in
+EXTRA_DIST += stdbool_.h
 
-# The following is needed in order to create an <stdbool.h> when the system
-# doesn't have one that works.
-all-local $(lib_OBJECTS): @STDBOOL_H@
-stdbool.h: stdbool.h.in
-       sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/stdbool.h.in > 
stdbool.h
+# Create stdbool.h on systems that lack a working one.
+all-local $(lib_OBJECTS): $(STDBOOL_H)
+stdbool.h: stdbool_.h
+       sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > 
address@hidden
+       mv address@hidden $@
 MOSTLYCLEANFILES += stdbool.h
 
 Include:
@@ -26,4 +26,3 @@ Include:
 
 Maintainer:
 Bruno Haible
-