* Makefile (clean): Clean tzdb-*, not tzdb. (tzdb-$(VERSION).tar.lz): The top level directory of the tzdb-VERSION.tar.lz tarball is now tzdb-VERSION, not just tzdb. This is the common practice elsewhere. --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 31a2ec5..9692a1d 100644 --- a/Makefile +++ b/Makefile @@ -568,7 +568,7 @@ clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdb $(TZS_NEW) + rm -fr *.dir tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -687,12 +687,13 @@ tzdata$(VERSION).tar.gz: set-timestamps.out gzip $(GZIPFLAGS) > $@ tzdb-$(VERSION).tar.lz: set-timestamps.out - rm -fr tzdb - mkdir tzdb - ln $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdb - touch -cmr $$(ls -t tzdb/* | sed 1q) tzdb + rm -fr tzdb-$(VERSION) + mkdir tzdb-$(VERSION) + ln $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) \ + tzdb-$(VERSION) + touch -cmr $$(ls -t tzdb-$(VERSION)/* | sed 1q) tzdb-$(VERSION) LC_ALL=C && export LC_ALL && \ - tar $(TARFLAGS) -cf - tzdb | lzip -9 > $@ + tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 > $@ signatures: tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \ tzdb-$(VERSION).tar.lz.asc -- 2.7.4