diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | timezone/Makefile | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c10024a541..75dbb36091 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-03-21 Allan McRae <allan@archlinux.org> + + * timezone/Makefile: Do not install iso3166.tab and zone.tab + 2012-03-21 Joseph Myers <joseph@codesourcery.com> [BZ #13871] diff --git a/timezone/Makefile b/timezone/Makefile index 00bfba6e23..9e55a6ac54 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -45,7 +45,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. CPPFLAGS-zic = -DNOT_IN_libc ifeq ($(have-ksh),yes) -install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab install-bin-script = tzselect generated += tzselect endif @@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new chmod 555 $@.new mv -f $@.new $@ - -$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ - $(inst_zonedir)/%: % $(+force) - $(do-install) |