gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / sched

diff --git a/modules/sched b/modules/sched
index 128ec35..9f9c5c9 100644 (file)
--- a/modules/sched
+++ b/modules/sched
@@ -12,17 +12,16 @@ configure.ac:
 gl_SCHED_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(SCHED_H)
-EXTRA_HEADERS += sched.h
-
 BUILT_SOURCES += $(SCHED_H)
 
 # We need the following in order to create a replacement for <sched.h> when
 # the system doesn't have one.
-sched.h: sched.in.h
+if GL_GENERATE_SCHED_H
+sched.h: sched.in.h $(top_builddir)/config.status
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_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' \
@@ -31,6 +30,10 @@ sched.h: sched.in.h
              < $(srcdir)/sched.in.h; \
        } > $@-t && \
        mv $@-t $@
+else
+sched.h: $(top_builddir)/config.status
+       rm -f $@
+endif
 MOSTLYCLEANFILES += sched.h sched.h-t
 
 Include: