From d61a48116980172858cf498be7715183619c8cd3 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Thu, 12 Apr 2007 14:29:30 +0000
Subject: [PATCH] put the zoneinfo library files directly in the lib/stdtime
 dir

---
 commands/zoneinfo/Makefile                    | 25 ++++++++-----------
 lib/generate.sh                               | 10 ++++----
 lib/stdtime/Makefile.in                       |  6 ++---
 {commands/zoneinfo => lib/stdtime}/asctime.c  |  0
 .../zoneinfo => lib/stdtime}/localtime.c      |  0
 {commands/zoneinfo => lib/stdtime}/strftime.c |  0
 6 files changed, 19 insertions(+), 22 deletions(-)
 rename {commands/zoneinfo => lib/stdtime}/asctime.c (100%)
 rename {commands/zoneinfo => lib/stdtime}/localtime.c (100%)
 rename {commands/zoneinfo => lib/stdtime}/strftime.c (100%)

diff --git a/commands/zoneinfo/Makefile b/commands/zoneinfo/Makefile
index bf2b5baec..7ef9f7b91 100644
--- a/commands/zoneinfo/Makefile
+++ b/commands/zoneinfo/Makefile
@@ -238,17 +238,17 @@ VALIDATE_ENV = \
 cc=		cc
 CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
 
-TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
-TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-TZDSRCS=	zdump.c localtime.c ialloc.c
-TZDOBJS=	zdump.o localtime.o ialloc.o
-DATESRCS=	date.c localtime.c logwtmp.c strftime.c asctime.c
-DATEOBJS=	date.o localtime.o logwtmp.o strftime.o asctime.o
-LIBSRCS=	localtime.c asctime.c difftime.c
-LIBOBJS=	localtime.o asctime.o difftime.o
+TZCSRCS=	zic.c scheck.c ialloc.c
+TZCOBJS=	zic.o scheck.o ialloc.o
+TZDSRCS=	zdump.c ialloc.c
+TZDOBJS=	zdump.o ialloc.o
+DATESRCS=	date.c logwtmp.c
+DATEOBJS=	date.o logwtmp.o
+LIBSRCS=	difftime.c
+LIBOBJS=	difftime.o
 HEADERS=	tzfile.h private.h
 NONLIBSRCS=	zic.c zdump.c scheck.c ialloc.c
-NEWUCBSRCS=	date.c logwtmp.c strftime.c
+NEWUCBSRCS=	date.c logwtmp.c
 SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) tzselect.ksh
 DOCS=		README Theory date.1 Makefile
 PRIMARY_YDATA=	africa antarctica asia australasia \
@@ -329,8 +329,8 @@ zones:		$(REDO)
 # We use the system's logwtmp in preference to ours if available.
 
 date:		$(DATEOBJS) logwtmp.o
-		$(CC) $(CFLAGS) date.o logwtmp.o localtime.o asctime.o \
-			strftime.o $(LDLIBS) -o $@
+		$(CC) $(CFLAGS) date.o logwtmp.o \
+			$(LDLIBS) -o $@
 
 tzselect:	tzselect.ksh
 		sed \
@@ -386,13 +386,10 @@ typecheck:
 zonenames:	$(TDATA)
 		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
 
-asctime.o:	private.h tzfile.h
 date.o:		private.h
 difftime.o:	private.h
 ialloc.o:	private.h
-localtime.o:	private.h tzfile.h
 scheck.o:	private.h
-strftime.o:	tzfile.h
 zic.o:		private.h tzfile.h
 
 .KEEP_STATE:
diff --git a/lib/generate.sh b/lib/generate.sh
index ad4d59872..f520a32e7 100644
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -167,7 +167,7 @@ for lib in $LIBRARIES
 		echo
 		for f in $FILES
 		{
-			o=`basename $f | sed -e 's/\\..\$/\.o/'`
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
 			echo "$ACKBASE/$lib.a: $ACKBASE/$lib.a($o)"
 		}
 		echo
@@ -177,7 +177,7 @@ for lib in $LIBRARIES
 		echo
 		for f in $FILES
 		{
-			o=`basename $f | sed -e 's/\\..\$/\.o/'`
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
 			echo "$ACKBASE/$lib.a($o): $f"
 			
 			ackCommands $ACKBASE/$OBJDIR/$o $f
@@ -191,7 +191,7 @@ for lib in $LIBRARIES
 		echo
 		for f in $FILES
 		{
-			o=`basename $f | sed -e 's/\\..\$/\.o/'`
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
 			echo "$GNUBASE/$lib.a: $GNUBASE/$OBJDIR/$o"
 		}
 		echo
@@ -200,7 +200,7 @@ for lib in $LIBRARIES
 		echo
 		for f in $FILES
 		{
-			o=`basename $f | sed -e 's/\\..\$/\.o/'`
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
 			
 			echo "$GNUBASE/$OBJDIR/$o: $f"
 			
@@ -214,7 +214,7 @@ echo
 #start files
 for f in $STARTFILES
 {
-	o=`basename $f | sed -e 's/\\..\$/\.o/'`
+	o=`echo $f | sed -e 's/\\..*\$/\.o/'`
 	
 	if [ $TYPE = "both" -o $TYPE = "ack" ]; then
 		echo "all-ack: $ACKBASE/$o"
diff --git a/lib/stdtime/Makefile.in b/lib/stdtime/Makefile.in
index 1d4c975e9..ea657d580 100644
--- a/lib/stdtime/Makefile.in
+++ b/lib/stdtime/Makefile.in
@@ -6,9 +6,9 @@ CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -D__USG -I$Z"
 
 LIBRARIES=libc
 libc_FILES="
-	$Z/asctime.c
-	$Z/localtime.c
-	$Z/strftime.c
+	asctime.c
+	localtime.c
+	strftime.c
 	"
 		
 TYPE=both
diff --git a/commands/zoneinfo/asctime.c b/lib/stdtime/asctime.c
similarity index 100%
rename from commands/zoneinfo/asctime.c
rename to lib/stdtime/asctime.c
diff --git a/commands/zoneinfo/localtime.c b/lib/stdtime/localtime.c
similarity index 100%
rename from commands/zoneinfo/localtime.c
rename to lib/stdtime/localtime.c
diff --git a/commands/zoneinfo/strftime.c b/lib/stdtime/strftime.c
similarity index 100%
rename from commands/zoneinfo/strftime.c
rename to lib/stdtime/strftime.c
-- 
2.44.0