[tz] [PATCH 1/2] Check 'public' more carefully.
Paul Eggert
eggert at cs.ucla.edu
Sun Nov 4 02:45:31 UTC 2012
Here's the first of two more proposed patches for next time.
* Makefile (ZFLAGS): Remove obsolete comment.
(check_public): Put temporary directory under this directory, not
under /tmp, as that's better if one is doing multiple builds in
parallel. Also, use the just-built zic rather than the system zic.
(clean): Remove temporary directory.
---
Makefile | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index fd909f7..ea081a3 100644
--- a/Makefile
+++ b/Makefile
@@ -229,9 +229,6 @@ CFLAGS=
LDFLAGS= $(LFLAGS)
-# If you want zic's -s option used when installing, uncomment the next line
-# ZFLAGS= -s
-
zic= ./zic
ZIC= $(zic) $(ZFLAGS)
@@ -411,6 +408,7 @@ check_web: $(WEB_PAGES)
clean:
rm -f core *.o *.out \
date tzselect version.h zdump zic yearistype
+ rm -f -r tzpublic
maintainer-clean: clean
@echo 'This command is intended for maintainers to use; it'
@@ -444,13 +442,12 @@ set-timestamps:
check_public: $(ENCHILADA)
make maintainer-clean
make "CFLAGS=$(GCC_DEBUG_FLAGS)"
- mkdir -m go-rwx /tmp/,tzpublic
- -for i in $(TDATA) ; do \
- zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; \
+ mkdir tzpublic
+ for i in $(TDATA) ; do \
+ $(zic) -v -d tzpublic $$i 2>&1 || exit; \
done
- for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done
- zic -v -d /tmp/,tzpublic $(TDATA) || exit
- rm -f -r /tmp/,tzpublic
+ $(zic) -v -d tzpublic $(TDATA)
+ rm -f -r tzpublic
tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
--
1.7.9.5
More information about the tz
mailing list