Make .h file creation more reliable.

3 files changed, 21 insertions, 7 deletions

diff --git a/modules/alloca b/modules/alloca
index bf9515d90d..dab7d00de4 100644
--- a/modules/alloca
+++ b/modules/alloca
@@ -19,8 +19,9 @@ EXTRA_DIST += alloca_.h
 # doesn't have one that works with the given compiler.
 all-local $(lib_OBJECTS): @ALLOCA_H@
 alloca.h: alloca_.h
-	cp $(srcdir)/alloca_.h alloca.h
-MOSTLYCLEANFILES += alloca.h
+	cp $(srcdir)/alloca_.h alloca.h-t
+	mv alloca.h-t alloca.h
+MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 Include:
 #include <alloca.h>
diff --git a/modules/fnmatch b/modules/fnmatch
index dfec965ac9..75e5189f1e 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -15,9 +15,15 @@ configure.ac:
 # No macro. You should also use one of fnmatch-posix or fnmatch-gnu.
 
 Makefile.am:
-lib_SOURCES += fnmatch_.h
-EXTRA_DIST += fnmatch_loop.c
-DISTCLEANFILES += fnmatch.h
+EXTRA_DIST += fnmatch_.h fnmatch_loop.c
+
+# We need the following in order to create an <fnmatch.h> when the system
+# doesn't have one that supports the required API.
+all-local $(lib_OBJECTS): @FNMATCH_H@
+fnmatch.h: fnmatch_.h
+	cp $(srcdir)/fnmatch_.h fnmatch.h-t
+	mv fnmatch.h-t fnmatch.h
+MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
 Include:
 <fnmatch.h>
diff --git a/modules/poll b/modules/poll
index 1d796adc24..a03affbbc4 100644
--- a/modules/poll
+++ b/modules/poll
@@ -12,8 +12,15 @@ configure.ac:
 gl_FUNC_POLL
 
 Makefile.am:
-noinst_HEADERS += poll_.h
-DISTCLEANFILES += poll.h
+EXTRA_DIST += poll_.h
+
+# We need the following in order to create an <poll.h> when the system
+# doesn't have one.
+all-local $(lib_OBJECTS): @POLL_H@
+poll.h: poll_.h
+	cp $(srcdir)/poll_.h poll.h-t
+	mv poll.h-t poll.h
+MOSTLYCLEANFILES += poll.h poll.h-t
 
 Include:
 #include <poll.h>