X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_file;h=fdfba45ddbb6a6c7128f064197c8eb794e2cf76c;hb=7dd6551404efff84abc69c3795dbe125cd13ebbd;hp=2c1f8f8e51740772b34f6fb028f700f963212b1d;hpb=e69247d77e183da8d4d1d20e8993933aa420cbca;p=gnulib.git

diff --git a/modules/sys_file b/modules/sys_file
index 2c1f8f8e5..fdfba45dd 100644
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -7,35 +7,37 @@ m4/sys_file_h.m4
 
 Depends-on:
 include_next
-link-warning
+warn-on-use
 
 configure.ac:
 gl_HEADER_SYS_FILE_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(SYS_FILE_H)
+BUILT_SOURCES += sys/file.h
 
 # We need the following in order to create <sys/file.h> when the system
 # has one that is incomplete.
-sys/file.h: sys_file.in.h
-	@MKDIR_P@ sys
-	rm -f $@-t $@
+sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_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' \
 	      -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \
 	      -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
 	      -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_file.in.h; \
-	} > $@-t
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += sys/file.h sys/file.h-t
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/file.h>
+<sys/file.h>
 
 License:
 LGPLv2+