X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fwctype;h=156235c6ba77a74cb52540776fca8727f4875cfd;hb=8e9b35958cc2102a37b6aa0e64509599c3460ebb;hp=33e49f605481694dccc3c300e73b9da21dbfecba;hpb=44fa0d78ad36205f393cd4aa4813d1e7a403d6dc;p=gnulib.git

diff --git a/modules/wctype b/modules/wctype
index 33e49f605..156235c6b 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -2,10 +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:
+include_next
 
 configure.ac:
 gl_WCTYPE_H
@@ -15,13 +17,15 @@ 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
+wctype.h: wctype.in.h
 	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; \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/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.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
@@ -30,7 +34,7 @@ Include:
 #include <wctype.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all