bin/104713: FreeBSD base and misc/zoneinfo conflict with each other

[Mark Andrews]

>Number:         104713
>Category:       bin
>Synopsis:       FreeBSD base and misc/zoneinfo conflict with each other
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 23 14:20:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Mark Andrews
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
ISC
>Environment:
System: FreeBSD bsdi.dv.isc.org 4.11-STABLE FreeBSD 4.11-STABLE #30: Mon Oct 23 08:56:59 EST 2006 marka at bsdi.dv.isc.org:/usr/obj/usr/src/sys/BSDI i386


>Description:

	misc/zoneinfo by default installs into /usr/share.

	This means whenever the OS is updated one has to re-install
	misc/zoneinfo.  

>How-To-Repeat:
	
>Fix:

	Make the installation of zoneinfo conditional

Index: share/Makefile
===================================================================
RCS file: /home/ncvs/src/share/Makefile,v
retrieving revision 1.22.2.4
diff -u -r1.22.2.4 Makefile
--- share/Makefile	12 Mar 2002 17:13:32 -0000	1.22.2.4
+++ share/Makefile	23 Oct 2006 05:04:34 -0000
@@ -4,7 +4,7 @@
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
 SUBDIR= colldef dict examples man me misc mk mklocale monetdef \
-	msgdef numericdef skel syscons tabset termcap timedef zoneinfo
+	msgdef numericdef skel syscons tabset termcap timedef
 
 .if !defined(NO_SHAREDOCS)
 SUBDIR+= doc
@@ -18,4 +18,8 @@
 SUBDIR+= sendmail
 .endif
 
+.if !defined(NO_ZONEINFO)
+SUBDIR+= zoneinfo
+.endif
+
 .include <bsd.subdir.mk>

>Release-Note:
>Audit-Trail:
>Unformatted: