Attachment #355992 for bug #481044

View | Details | Raw Unified | Return to bug 481044
Collapse All | Expand All




- Fix up default paths
- Support env DESTDIR / LDFLAGS / CFLAGS / CC
- Use awk instead of nawk
- Don't build/install libtz.a
- Don't install man-pages provided by sys-apps/man-pages
- Move zic zdump to sbin and tzselect to bin ala glibc
- Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
- Install leaps zoneinfo into zoneinfo/right/ ala glibc
- Disable broken web test
- Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
- Flags to the linking are passed as LDFLAGS, not LFLAGS
- LDFLAGS was missed for the 'date' target
++ Makefile

# Everything gets put in subdirectories of. . .

TOPDIR=		$(DESTDIR)/usr

# "Compiled" time zone information is placed in the "TZDIR" directory

# Use an absolute path name for TZDIR unless you're just testing the software.

TZDIR=		$(TOPDIR)/share/zoneinfo

# The "tzselect", "zic", and "zdump" commands get installed in. . .

SBINDIR=		$(TOPDIR)/sbin

# If you "make INSTALL", the "date" command gets installed in. . .

# Manual pages go in subdirectories of. . .

MANDIR=		$(TOPDIR)/share/man

# Library functions are put in an archive in LIBDIR.


###############################################################################

CC+=		-DTZDIR=\"$(TZDIR)\"
ifeq ($(NLS),1)
CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
endif

TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o

ALL:		all date

install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
		$(ZIC) -y $(YEARISTYPE) \
			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
		cp iso3166.tab zone.tab $(TZDIR)/.
		-mkdir $(TOPDIR) $(SBINDIR)
		cp zic zdump $(SBINDIR)/.
		-mkdir $(TOPDIR) $(BINDIR)
		cp tzselect $(BINDIR)/.
		-mkdir $(TOPDIR) $(MANDIR) \
			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8

			$(MANDIR)/man8/zic.8
		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
		cp tzfile.5 $(MANDIR)/man5/.
		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.

INSTALL:	ALL install date.1

# to using them, or vice versa.
other_two:	zic leapseconds $(TDATA)
		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
		$(ZIC) -y $(YEARISTYPE) \
			-d $(TZDIR)/right -L leapseconds $(TDATA)

posix_right:	posix_only other_two

		chmod +x $@

check:		check_character_set check_tables

check_tables:	checktab.awk $(PRIMARY_YDATA)

Return to bug 481044

Line Link Here

(-)file_not_specified_in_diff (-15 / +17 lines)
	- Fix up default paths		- Fix up default paths
1	- Support env DESTDIR / LDFLAGS / CFLAGS / CC	1	- Support env DESTDIR / LDFLAGS / CFLAGS / CC
2	- Use awk instead of nawk	2	- Use awk instead of nawk
3	- Don't build/install libtz.a	3	- Don't build/install libtz.a
4	- Don't install man-pages provided by sys-apps/man-pages	4	- Don't install man-pages provided by sys-apps/man-pages
5	- Move zic zdump to sbin and tzselect to bin ala glibc	5	- Move zic zdump to sbin and tzselect to bin ala glibc
6	- Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc	6	- Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
7	- Install leaps zoneinfo into zoneinfo/right/ ala glibc	7	- Install leaps zoneinfo into zoneinfo/right/ ala glibc
8	- Disable broken web test	8	- Disable broken web test
9	- Make sure tzselect uses #!/bin/bash and not #!/bin/ksh	9	- Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
10	- Flags to the linking are passed as LDFLAGS, not LFLAGS	10	- Flags to the linking are passed as LDFLAGS, not LFLAGS
11	- LDFLAGS was missed for the 'date' target	11	- LDFLAGS was missed for the 'date' target
12	-- Makefile	12	++ Makefile
Lines 35-39 Link Here
35	# Everything gets put in subdirectories of. . .	35	# Everything gets put in subdirectories of. . .
36		36
37	TOPDIR= /usr/local	37	TOPDIR= $(DESTDIR)/usr
38		38
39	# "Compiled" time zone information is placed in the "TZDIR" directory	39	# "Compiled" time zone information is placed in the "TZDIR" directory
Lines 41-49 Link Here
41	# Use an absolute path name for TZDIR unless you're just testing the software.	41	# Use an absolute path name for TZDIR unless you're just testing the software.
42		42
43	TZDIR= $(TOPDIR)/etc/zoneinfo	43	TZDIR= $(TOPDIR)/share/zoneinfo
44		44
45	# The "tzselect", "zic", and "zdump" commands get installed in. . .	45	# The "tzselect", "zic", and "zdump" commands get installed in. . .
46		46
47	ETCDIR= $(TOPDIR)/etc	47	SBINDIR= $(TOPDIR)/sbin
48		48
49	# If you "make INSTALL", the "date" command gets installed in. . .	49	# If you "make INSTALL", the "date" command gets installed in. . .
Lines 53-57 Link Here
53	# Manual pages go in subdirectories of. . .	53	# Manual pages go in subdirectories of. . .
54		54
55	MANDIR= $(TOPDIR)/man	55	MANDIR= $(TOPDIR)/share/man
56		56
57	# Library functions are put in an archive in LIBDIR.	57	# Library functions are put in an archive in LIBDIR.
Lines 241-248 Link Here
241		241
242	###############################################################################	242	###############################################################################
243		243
244	cc= cc	244	CC+= -DTZDIR=\"$(TZDIR)\"
245	CC= $(cc) -DTZDIR=\"$(TZDIR)\"	245	ifeq ($(NLS),1)
		246	CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
		247	endif
246		248
247	TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c	249	TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
248	TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o	250	TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
Lines 281-291 Link Here
281	ALL: all date	281	ALL: all date
282		282
283	install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)	283	install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
284	$(ZIC) -y $(YEARISTYPE) \	284	$(ZIC) -y $(YEARISTYPE) \
285	-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)	285	-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
286	-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab	286	-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
287	cp iso3166.tab zone.tab $(TZDIR)/.	287	cp iso3166.tab zone.tab $(TZDIR)/.
288	-mkdir $(TOPDIR) $(ETCDIR)	288	-mkdir $(TOPDIR) $(SBINDIR)
289	cp tzselect zic zdump $(ETCDIR)/.	289	cp zic zdump $(SBINDIR)/.
		290	-mkdir $(TOPDIR) $(BINDIR)
		291	cp tzselect $(BINDIR)/.
290	-mkdir $(TOPDIR) $(MANDIR) \	292	-mkdir $(TOPDIR) $(MANDIR) \
291	$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8	293	$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
Lines 297-302 Link Here
297	$(MANDIR)/man8/zic.8	299	$(MANDIR)/man8/zic.8
298	cp newctime.3 newtzset.3 $(MANDIR)/man3/.	300	cp newctime.3 newtzset.3 $(MANDIR)/man3/.
299	cp tzfile.5 $(MANDIR)/man5/.
300	cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
301		301
302	INSTALL: ALL install date.1	302	INSTALL: ALL install date.1
Lines 333-339 Link Here
333	# to using them, or vice versa.	333	# to using them, or vice versa.
334	other_two: zic leapseconds $(TDATA)	334	other_two: zic leapseconds $(TDATA)
335	$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)	335	$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
336	$(ZIC) -y $(YEARISTYPE) \	336	$(ZIC) -y $(YEARISTYPE) \
337	-d $(TZDIR)-leaps -L leapseconds $(TDATA)	337	-d $(TZDIR)/right -L leapseconds $(TDATA)
338		338
339	posix_right: posix_only other_two	339	posix_right: posix_only other_two
Lines 421-425 Link Here
421	chmod +x $@	421	chmod +x $@
422		422
423	check: check_character_set check_tables check_web	423	check: check_character_set check_tables
424		424
425	check_tables: checktab.awk $(PRIMARY_YDATA)	425	check_tables: checktab.awk $(PRIMARY_YDATA)