X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fwctype;h=157c3ddf6abe0f40362517ae63e1516d6cb20daf;hb=5abb9c9cbcf1c199155bce1f10324ce0e45f1e90;hp=e514a2d9aaaa5ec0e68cd421d3a49fb595221310;hpb=0191a7041eba6c7f9190e56dea2430ded092fc68;p=gnulib.git

diff --git a/modules/wctype b/modules/wctype
index e514a2d9a..157c3ddf6 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -2,12 +2,12 @@ Description:
 A <wctype.h> that conforms better to C99.
 
 Files:
-lib/wctype_.h
+lib/wctype.in.h
 m4/wctype.m4
 m4/wint_t.m4
 
 Depends-on:
-absolute-header
+include_next
 
 configure.ac:
 gl_WCTYPE_H
@@ -17,22 +17,26 @@ 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|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
-	      -e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/g' \
-	      < $(srcdir)/wctype_.h; \
-	} > $@-t
+	      -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' \
+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
 Include:
-#include <wctype.h>
+<wctype.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all