X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flanginfo;h=2519fc5612ef9bca9c04456ff8c1ae6487ae1d76;hb=4470580881a7b821b52fb5635102ef3e27aa5af4;hp=fd23db9f2aec73920f7ab847d9b5732c347d5458;hpb=968e74c2c0e0e74869e210e093f0aa9265b1e5b5;p=gnulib.git

diff --git a/modules/langinfo b/modules/langinfo
index fd23db9f2..2519fc561 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -8,8 +8,8 @@ m4/langinfo_h.m4
 Depends-on:
 extensions
 include_next
-c++defs
-warn-on-use
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_LANGINFO_H
@@ -19,15 +19,16 @@ BUILT_SOURCES += langinfo.h
 
 # We need the following in order to create an empty placeholder for
 # <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|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_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
-	      -e 's|@''GNULIB_NL_LANGINFO''@|$(GNULIB_NL_LANGINFO)|g' \
+	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
 	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
 	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
 	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \