X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ftime;h=9cdfa4c936f01ba3df429c7e844aa108fcc5ae5d;hb=8e9b35958cc2102a37b6aa0e64509599c3460ebb;hp=d93ee8df4a4385e91eb200d7734575bbc8531d5c;hpb=3ac9552429c5a500717e1d3d129c32f7d0ea37a3;p=gnulib.git

diff --git a/modules/time b/modules/time
index d93ee8df4..9cdfa4c93 100644
--- a/modules/time
+++ b/modules/time
@@ -2,12 +2,12 @@ Description:
 A more-standard <time.h>.
 
 Files:
-lib/time_.h
+lib/time.in.h
 m4/time_h.m4
 
 Depends-on:
-absolute-header
 extensions
+include_next
 
 configure.ac:
 gl_HEADER_TIME_H
@@ -17,17 +17,18 @@ BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time_.h
+time.h: time.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@ABSOLUTE_TIME_H''@|$(ABSOLUTE_TIME_H)|g' \
- 	      -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
- 	      -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
- 	      -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \
- 	      -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
- 	      -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
- 	      -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
-	      < $(srcdir)/time_.h; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
+	      -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
+	      -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
+	      -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \
+	      -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+	      -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+	      < $(srcdir)/time.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += time.h time.h-t
@@ -36,7 +37,7 @@ Include:
 #include <time.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all