X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ftermios;h=facebebde972b56e5b51cca23a81efe4004e2913;hb=533101a268dc5015a140ff4695d8eeb04fbe57b6;hp=ec3f6fc5d381dd2f9ad118774f2d307cd55e25dc;hpb=b4b6391081d1173278396afdf098be68b1768752;p=gnulib.git

diff --git a/modules/termios b/modules/termios
index ec3f6fc5d..facebebde 100644
--- a/modules/termios
+++ b/modules/termios
@@ -7,8 +7,8 @@ m4/termios_h.m4
 
 Depends-on:
 include_next
-c++defs
-warn-on-use
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_TERMIOS_H
@@ -21,11 +21,12 @@ BUILT_SOURCES += termios.h
 termios.h: termios.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|@''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_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
-	      -e 's|@''GNULIB_TCGETSID''@|$(GNULIB_TCGETSID)|g' \
+	      -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \
 	      -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \
 	      -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \