X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flocale;h=a565c03b135a0bf5de05bbf2c15170b302f35c57;hb=3606b90f3c4a19708ef05140837f2aa307f2516f;hp=2110f15dde06f3798bca6191e8d59e721869ffeb;hpb=6a595066f7444ae86941cabf229b12938622faa3;p=gnulib.git

diff --git a/modules/locale b/modules/locale
index 2110f15dd..a565c03b1 100644
--- a/modules/locale
+++ b/modules/locale
@@ -2,26 +2,43 @@ Description:
 A <locale.h> that conforms to POSIX.
 
 Files:
-lib/locale_.h
+lib/locale.in.h
 m4/locale_h.m4
 
 Depends-on:
-absolute-header
+arg-nonnull
+c++defs
+extensions
+include_next
+stddef
+warn-on-use
 
 configure.ac:
 gl_LOCALE_H
 
 Makefile.am:
-BUILT_SOURCES += $(LOCALE_H)
+BUILT_SOURCES += locale.h
 
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
-locale.h: locale_.h
-	rm -f $@-t $@
+locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''ABSOLUTE_LOCALE_H''@|$(ABSOLUTE_LOCALE_H)|g' \
-	      < $(srcdir)/locale_.h; \
-	} > $@-t
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+	      -e 's|@''GNULIB_SETLOCALE''@|$(GNULIB_SETLOCALE)|g' \
+	      -e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/locale.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += locale.h locale.h-t
 
@@ -29,8 +46,7 @@ Include:
 <locale.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible
-