X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_wait;h=a270d914cf5c6b9d9e3f4ced45ed993d2d0ae42c;hb=8866a241ddbf4a459347b7147e325f539e4c07fe;hp=0299f9e2dea357fe7d3f69a645332055254c9608;hpb=968e74c2c0e0e74869e210e093f0aa9265b1e5b5;p=gnulib.git

diff --git a/modules/sys_wait b/modules/sys_wait
index 0299f9e2d..a270d914c 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -6,9 +6,9 @@ lib/sys_wait.in.h
 m4/sys_wait_h.m4
 
 Depends-on:
-c++defs
 include_next
-warn-on-use
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_SYS_WAIT_H
@@ -19,15 +19,16 @@ BUILT_SOURCES += sys/wait.h
 
 # We need the following in order to create <sys/wait.h> when the system
 # has one that is incomplete.
-sys/wait.h: sys_wait.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-	      -e 's|@''GNULIB_WAITPID''@|$(GNULIB_WAITPID)|g' \
+	      -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_wait.in.h; \