X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsys_time;h=77a20d6cda1fa7980732bafc0236afc34a87629e;hb=d3546315684435f31c4d95e26ead751aaa8ea7e8;hp=16a227eb2b9031c0e55587617c8ce31ce6f649dc;hpb=5661ab9d49512b4cf3c19caa11bb581d8ce561ba;p=gnulib.git

diff --git a/modules/sys_time b/modules/sys_time
index 16a227eb2..77a20d6cd 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -2,30 +2,32 @@ Description:
 A <sys/time.h> that conforms better to POSIX.
 
 Files:
-lib/sys_time_.h
+lib/sys_time.in.h
 m4/sys_time_h.m4
 
 Depends-on:
-absolute-header
+include_next
 
 configure.ac:
 gl_HEADER_SYS_TIME_H
+AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/time.h
+BUILT_SOURCES += $(SYS_TIME_H)
 
 # We need the following in order to create <sys/time.h> when the system
 # doesn't have one that works with the given compiler.
-sys/time.h: sys_time_.h
-	test -d sys || mkdir sys
+sys/time.h: sys_time.in.h
+	@MKDIR_P@ sys
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-	      -e 's|@''ABSOLUTE_SYS_TIME_H''@|$(ABSOLUTE_SYS_TIME_H)|g' \
-	      -e 's/@''GETTIMEOFDAY_CLOBBERS_LOCALTIME''@/$(GETTIMEOFDAY_CLOBBERS_LOCALTIME)/g' \
-	      -e 's/@''HAVE_GETTIMEOFDAY_POSIX_SIGNATURE''@/$(HAVE_GETTIMEOFDAY_POSIX_SIGNATURE)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
 	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-	      < $(srcdir)/sys_time_.h; \
+	      < $(srcdir)/sys_time.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += sys/time.h sys/time.h-t
@@ -34,7 +36,7 @@ Include:
 #include <sys/time.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all