about summary refs log tree commit diff
path: root/timezone
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-09-18 14:00:05 -0400
committerMike Frysinger <vapier@gentoo.org>2015-09-18 19:39:46 -0400
commit1cba4036b6f5e798114c7cc77c788839c89e3b3c (patch)
tree7c399ad0e7a357d82cc5aeec35e03c4419c2ada9 /timezone
parent36546ffbef5d4f5ea0f5d5c8e3fe5a5c9a34ea47 (diff)
downloadglibc-1cba4036b6f5e798114c7cc77c788839c89e3b3c.tar.gz
glibc-1cba4036b6f5e798114c7cc77c788839c89e3b3c.tar.xz
glibc-1cba4036b6f5e798114c7cc77c788839c89e3b3c.zip
timezone: add a configure flag to disable program install
Some distros build+install the timezone tools (zic/zdump/tzselect) outside
of glibc and use the upstream package directly.  Add a configure flag to
glibc so they can disable install of those tools.

This allows tests to run & pass regardless of the configure flag.  Only
the install of them is impacted.
Diffstat (limited to 'timezone')
-rw-r--r--timezone/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/timezone/Makefile b/timezone/Makefile
index bfb3463373..a0b8adb5a6 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -27,15 +27,17 @@ extra-objs := scheck.o ialloc.o
 others	:= zdump zic
 tests	:= test-tz tst-timezone tst-tzset
 
-install-sbin := zic zdump
-
 generated-dirs += testdata
 
-install-bin-script = tzselect
 generated += tzselect
 
 testdata = $(objpfx)testdata
 
+ifeq ($(enable-timezone-tools),yes)
+install-sbin := zic zdump
+install-bin-script = tzselect
+endif
+
 ifeq ($(run-built-tests),yes)
 # List zones generated by separate commands running zic on the host.
 # Each such zic run counts as a separate test.