openat: provide more convenience names

[pspp] / modules / wctype

diff --git a/modules/wctype b/modules/wctype
index b47a3913bcac3e22732c7c2eec013b37c271a3d1..ce6ed156bde64b6b047d9f5daaf2585331a00d71 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -2,7 +2,7 @@ Description:
 A <wctype.h> that conforms better to C99.
 
 Files:
-lib/wctype_.h
+lib/wctype.in.h
 m4/wctype.m4
 m4/wint_t.m4
 
@@ -17,16 +17,18 @@ BUILT_SOURCES += $(WCTYPE_H)
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype_.h
-       rm -f $@-t $@
+wctype.h: wctype.in.h
+       $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-             < $(srcdir)/wctype_.h; \
-       } > $@-t
+             -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+             < $(srcdir)/wctype.in.h; \
+       } > $@-t && \
        mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
@@ -34,7 +36,7 @@ Include:
 #include <wctype.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all