X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffcntl;h=ccd26ed252bf3ee4450cd3bc1b929d52a717e371;hb=76888b1414b08849396e306748bfdf3cbfb9f928;hp=350ca5002ac80bb772e7ba89e9b6fa1c45e4a4bb;hpb=e8886c908325158b4e127ac82fbc4fb8918aad85;p=gnulib.git

diff --git a/modules/fcntl b/modules/fcntl
index 350ca5002..ccd26ed25 100644
--- a/modules/fcntl
+++ b/modules/fcntl
@@ -2,11 +2,11 @@ Description:
 Like <fcntl.h>, but with non-working flags defined to 0.
 
 Files:
-lib/fcntl_.h
-m4/absolute-header.m4
+lib/fcntl.in.h
 m4/fcntl_h.m4
 
 Depends-on:
+include_next
 unistd
 
 configure.ac:
@@ -14,15 +14,18 @@ gl_FCNTL_H
 
 Makefile.am:
 BUILT_SOURCES += $(FCNTL_H)
-EXTRA_DIST += fcntl_.h
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl_.h
+fcntl.h: fcntl.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
-	      < $(srcdir)/fcntl_.h; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+	      < $(srcdir)/fcntl.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += fcntl.h fcntl.h-t