X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flocale;h=4c66c84e2481e5529920ebb6711898068f812358;hb=4470580881a7b821b52fb5635102ef3e27aa5af4;hp=9c350cf817a8616b2b262f43903c20eb03706a11;hpb=4f1d12a5e3cef3d0da80e63320fcbc4d46a39c14;p=gnulib.git

diff --git a/modules/locale b/modules/locale
index 9c350cf81..4c66c84e2 100644
--- a/modules/locale
+++ b/modules/locale
@@ -6,12 +6,12 @@ lib/locale.in.h
 m4/locale_h.m4
 
 Depends-on:
-arg-nonnull
-c++defs
 extensions
 include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
 stddef
-warn-on-use
 
 configure.ac:
 gl_LOCALE_H
@@ -21,15 +21,16 @@ 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.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -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/@''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' \