X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fnetinet_in;h=7d09a3761bc0c6282ed9fc3727e1ac00b466f31f;hb=0447803a9a2d924f6dd0c4d0042256f065332b4e;hp=1a7fc7be0b9b1edb4190016adc3cadf1515c7e14;hpb=73f2a1c055c8dfa46d1a4db04a841d952e11c6a0;p=gnulib.git

diff --git a/modules/netinet_in b/modules/netinet_in
index 1a7fc7be0..7d09a3761 100644
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -2,7 +2,7 @@ Description:
 A <netinet/in.h> for systems lacking it.
 
 Files:
-lib/netinet_in_.h
+lib/netinet_in.in.h
 m4/netinet_in_h.m4
 
 Depends-on:
@@ -18,24 +18,32 @@ BUILT_SOURCES += $(NETINET_IN_H)
 
 # We need the following in order to create <netinet/in.h> when the system
 # doesn't have one.
-netinet/in.h:
-	@MKDIR_P@ netinet
-	rm -f $@-t $@
+if GL_GENERATE_NETINET_IN_H
+netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
+	$(AM_V_at)$(MKDIR_P) netinet
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
 	      -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
-	      < $(srcdir)/netinet_in_.h; \
-	} > $@-t
+	      < $(srcdir)/netinet_in.in.h; \
+	} > $@-t && \
 	mv $@-t $@
+else
+netinet/in.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
 MOSTLYCLEANDIRS += netinet
 
 Include:
-#include <netinet/in.h>
+<netinet/in.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson