X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstdnoreturn;h=acd661b28213f08919397c50a0761e1ca9938935;hb=644c40496cf7d5a705a73c9dd32b035fcecc2ab1;hp=1778862f51647ab7255d32926f18b125572084f8;hpb=a64f669549a2ed455e99e313d6207a3711e5e5bd;p=gnulib.git

diff --git a/modules/stdnoreturn b/modules/stdnoreturn
index 1778862f5..acd661b28 100644
--- a/modules/stdnoreturn
+++ b/modules/stdnoreturn
@@ -1,11 +1,12 @@
 Description:
-A <stdnoreturn.h> that conforms to C1X.
+A <stdnoreturn.h> that nearly conforms to ISO C11.
 
 Files:
+lib/stdnoreturn.in.h
 m4/stdnoreturn.m4
 
 Depends-on:
-_Noreturn
+snippet/_Noreturn
 
 configure.ac:
 gl_STDNORETURN_H
@@ -13,16 +14,21 @@ gl_STDNORETURN_H
 Makefile.am:
 BUILT_SOURCES += $(STDNORETURN_H)
 
-# Create <stdnoreturn.h> when the system doesn't have one that works.
+# We need the following in order to create <stdnoreturn.h> when the system
+# doesn't have one that works.
 if GL_GENERATE_STDNORETURN_H
-stdnoreturn.h: $(top_builddir)/config.status $(_NORETURN_H)
-	{ cat $(_NORETURN_H) && echo '#define noreturn _Noreturn'; } > $@-t
+stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+              < $(srcdir)/stdnoreturn.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 else
 stdnoreturn.h: $(top_builddir)/config.status
 	rm -f $@
 endif
-MOSTLYCLEANFILES += stdnoreturn.h
+MOSTLYCLEANFILES += stdnoreturn.h stdnoreturn.h-t
 
 Include:
 <stdnoreturn.h>
@@ -31,4 +37,4 @@ License:
 LGPLv2+
 
 Maintainer:
-all
+Paul Eggert