X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_times;h=66a36f135d4fb797756a7108f9e61c47fd2805e1;hb=cebba9faecfecedf8378a06f46823166e3b4374a;hp=5905285b3f62fd9d29a57fe4a630ebf38e776d8b;hpb=b4b6391081d1173278396afdf098be68b1768752;p=gnulib.git

diff --git a/modules/sys_times b/modules/sys_times
index 5905285b3..66a36f135 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -6,9 +6,9 @@ lib/sys_times.in.h
 m4/sys_times_h.m4
 
 Depends-on:
-arg-nonnull
 include_next
-warn-on-use
+snippet/arg-nonnull
+snippet/warn-on-use
 
 configure.ac:
 gl_SYS_TIMES_H
@@ -23,12 +23,13 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_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_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \
-	      -e 's|@''GNULIB_TIMES''@|$(GNULIB_TIMES)|g' \
+	      -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \
 	      -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \
 	      -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \