X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fpoll-h;h=7c03786e0c4b038a57e8a07f8171ed0c7292d601;hb=a425462f784164b73297d8992075fd9aebd65a94;hp=7ba11adc0d319c2a7edfc5dc6b022279269bb771;hpb=e4d8bbdec2fcea003b8c38ef6313e323478353c2;p=gnulib.git

diff --git a/modules/poll-h b/modules/poll-h
index 7ba11adc0..7c03786e0 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -6,22 +6,29 @@ lib/poll.in.h
 m4/poll_h.m4
 
 Depends-on:
-c++defs
 extensions
-warn-on-use
+include_next
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_POLL_H
 
 Makefile.am:
-BUILT_SOURCES += $(POLL_H)
+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|@''GNULIB_POLL''@|$(GNULIB_POLL)|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|@''HAVE_POLL''@|$(HAVE_POLL)|g' \
 	      -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \