X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fpoll-h;h=7c03786e0c4b038a57e8a07f8171ed0c7292d601;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=c456ae53009981db846f7cf2dcdaa645554621c1;hpb=55898ee1c7c12e63772c65e772577f10bb7adb31;p=gnulib.git

diff --git a/modules/poll-h b/modules/poll-h
index c456ae530..7c03786e0 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -6,10 +6,10 @@ lib/poll.in.h
 m4/poll_h.m4
 
 Depends-on:
-c++defs
 extensions
 include_next
-warn-on-use
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_POLL_H
@@ -19,14 +19,16 @@ BUILT_SOURCES += poll.h
 
 # We need the following in order to create <poll.h> when the system
 # doesn't have one.
-poll.h: poll.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+poll.h: poll.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_POLL_H''@|$(HAVE_POLL_H)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_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_POLL_H''@|$(NEXT_POLL_H)|g' \
-	      -e 's|@''GNULIB_POLL''@|$(GNULIB_POLL)|g' \
+	      -e 's/@''GNULIB_POLL''@/$(GNULIB_POLL)/g' \
 	      -e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \
 	      -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \