Date: Fri, 4 Dec 2015 18:21:05 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r291794 - in stable/10: etc sbin/atm/atmconfig share/colldef share/examples/smbfs share/examples/smbfs/print share/keys/pkg/trusted share/mklocale share/monetdef share/msgdef share/nume... Message-ID: <201512041821.tB4IL5if019477@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Dec 4 18:21:05 2015 New Revision: 291794 URL: https://svnweb.freebsd.org/changeset/base/291794 Log: MFC r290083: Use more appropriate ${SHAREDIR} rather than /usr/share. Modified: stable/10/etc/Makefile stable/10/sbin/atm/atmconfig/Makefile stable/10/share/colldef/Makefile stable/10/share/examples/smbfs/Makefile stable/10/share/examples/smbfs/print/Makefile stable/10/share/keys/pkg/trusted/Makefile stable/10/share/mklocale/Makefile stable/10/share/monetdef/Makefile stable/10/share/msgdef/Makefile stable/10/share/numericdef/Makefile stable/10/share/sendmail/Makefile stable/10/share/skel/Makefile stable/10/share/timedef/Makefile stable/10/usr.bin/vi/catalog/Makefile stable/10/usr.sbin/ndiscvt/Makefile stable/10/usr.sbin/zic/zdump/Makefile stable/10/usr.sbin/zic/zic/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/Makefile ============================================================================== --- stable/10/etc/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/etc/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -378,26 +378,26 @@ distrib-dirs: ${MTREES:N/*} .endif ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys .if ${MK_MAN} != "no" - cd ${DESTDIR}/usr/share/man; \ + cd ${DESTDIR}${SHAREDIR}/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}/usr/share/man/en.ISO8859-1/; \ + ${DESTDIR}${SHAREDIR}/man/en.ISO8859-1/; \ ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}/usr/share/man/en.UTF-8/; \ + ${DESTDIR}${SHAREDIR}/man/en.UTF-8/; \ done .if ${MK_OPENSSL} != "no" - cd ${DESTDIR}/usr/share/openssl/man; \ + cd ${DESTDIR}${SHAREDIR}/openssl/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \ + ${DESTDIR}${SHAREDIR}/openssl/man/en.ISO8859-1/; \ done .endif set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \ + ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/man/$$1"; \ if [ "${MK_OPENSSL}" != "no" ]; then \ ${INSTALL_SYMLINK} "$$2" \ - "${DESTDIR}/usr/share/openssl/man/$$1"; \ + "${DESTDIR}${SHAREDIR}/openssl/man/$$1"; \ fi; \ shift; shift; \ done @@ -405,7 +405,7 @@ distrib-dirs: ${MTREES:N/*} .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ + ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \ shift; shift; \ done .endif @@ -413,8 +413,8 @@ distrib-dirs: ${MTREES:N/*} etc-examples: cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ - ${DESTDIR}/usr/share/examples/etc + ${DESTDIR}${SHAREDIR}/examples/etc ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ - DESTDIR=${DESTDIR}/usr/share/examples + DESTDIR=${DESTDIR}${SHAREDIR}/examples .include <bsd.prog.mk> Modified: stable/10/sbin/atm/atmconfig/Makefile ============================================================================== --- stable/10/sbin/atm/atmconfig/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/sbin/atm/atmconfig/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -10,7 +10,7 @@ PROG= atmconfig SRCS= main.c diag.c natm.c MAN= atmconfig.8 -# CFLAGS+= -DPATH_HELP='".:/usr/share/doc/atm:/usr/local/share/doc/atm"' +# CFLAGS+= -DPATH_HELP='".:${SHAREDIR}/doc/atm:/usr/local/share/doc/atm"' CFLAGS+= -I${.OBJDIR} @@ -33,7 +33,7 @@ WARNS?= 3 .endif FILES= atmconfig.help atmconfig_device.help -FILESDIR= /usr/share/doc/atm +FILESDIR= ${SHAREDIR}/doc/atm SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \ ${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def Modified: stable/10/share/colldef/Makefile ============================================================================== --- stable/10/share/colldef/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/colldef/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -42,7 +42,7 @@ LOCALES= bg_BG.CP1251 \ uk_UA.ISO8859-5 \ uk_UA.KOI8-U -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out Modified: stable/10/share/examples/smbfs/Makefile ============================================================================== --- stable/10/share/examples/smbfs/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/examples/smbfs/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -1,7 +1,7 @@ # $FreeBSD$ NO_OBJ= -BINDIR= /usr/share/examples/smbfs +FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc .PATH: ${.CURDIR}/../../../contrib/smbfs/examples Modified: stable/10/share/examples/smbfs/print/Makefile ============================================================================== --- stable/10/share/examples/smbfs/print/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/examples/smbfs/print/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -1,7 +1,7 @@ # $FreeBSD$ NO_OBJ= -BINDIR= /usr/share/examples/smbfs/print +FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print Modified: stable/10/share/keys/pkg/trusted/Makefile ============================================================================== --- stable/10/share/keys/pkg/trusted/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/keys/pkg/trusted/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -4,7 +4,7 @@ NO_OBJ= FILES= pkg.freebsd.org.2013102301 -FILESDIR= /usr/share/keys/pkg/trusted +FILESDIR= ${SHAREDIR}/keys/pkg/trusted FILESMODE= 644 .include <bsd.prog.mk> Modified: stable/10/share/mklocale/Makefile ============================================================================== --- stable/10/share/mklocale/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/mklocale/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -30,7 +30,7 @@ LOCALES= UTF-8 \ zh_HK.Big5HKSCS \ zh_TW.Big5 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out Modified: stable/10/share/monetdef/Makefile ============================================================================== --- stable/10/share/monetdef/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/monetdef/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -90,7 +90,7 @@ LOCALES= af_ZA.ISO8859-1 \ zh_HK.UTF-8 \ zh_TW.Big5 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out Modified: stable/10/share/msgdef/Makefile ============================================================================== --- stable/10/share/msgdef/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/msgdef/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -70,7 +70,7 @@ LOCALES= af_ZA.ISO8859-1 \ zh_TW.Big5 \ zh_TW.UTF-8 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out Modified: stable/10/share/numericdef/Makefile ============================================================================== --- stable/10/share/numericdef/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/numericdef/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -44,7 +44,7 @@ LOCALES= af_ZA.ISO8859-1 \ uk_UA.KOI8-U \ zh_CN.eucCN -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out Modified: stable/10/share/sendmail/Makefile ============================================================================== --- stable/10/share/sendmail/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/sendmail/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -7,7 +7,7 @@ CFDIR= cf CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print) -DDIR= ${DESTDIR}/usr/share/sendmail +DDIR= ${DESTDIR}${SHAREDIR}/sendmail NO_OBJ= Modified: stable/10/share/skel/Makefile ============================================================================== --- stable/10/share/skel/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/skel/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -5,8 +5,8 @@ FILESGROUPS= FILES1 FILES2 FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ dot.shrc FILES2= dot.mail_aliases dot.rhosts -FILES1DIR= /usr/share/skel -FILES2DIR= /usr/share/skel +FILES1DIR= ${SHAREDIR}/skel +FILES2DIR= ${SHAREDIR}/skel FILES1MODE= 0644 FILES2MODE= 0600 NO_OBJ= Modified: stable/10/share/timedef/Makefile ============================================================================== --- stable/10/share/timedef/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/share/timedef/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -96,7 +96,7 @@ LOCALES= am_ET.UTF-8 \ zh_TW.Big5 \ zh_TW.UTF-8 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out Modified: stable/10/usr.bin/vi/catalog/Makefile ============================================================================== --- stable/10/usr.bin/vi/catalog/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/usr.bin/vi/catalog/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -115,7 +115,7 @@ SVLINKS= sv_SE PLLINKS= pl_PL FILES= ${CATALOGS} -FILESDIR= /usr/share/vi/catalog +FILESDIR= ${SHAREDIR}/vi/catalog SYMLINKS= .for l in ${NLLINKS} SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-1 Modified: stable/10/usr.sbin/ndiscvt/Makefile ============================================================================== --- stable/10/usr.sbin/ndiscvt/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/usr.sbin/ndiscvt/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -24,7 +24,7 @@ CLEANFILES= y.output FILES= windrv_stub.c FILESNAME= windrv_stub.c -FILESDIR= /usr/share/misc +FILESDIR= ${SHAREDIR}/misc SCRIPTS= ndisgen.sh Modified: stable/10/usr.sbin/zic/zdump/Makefile ============================================================================== --- stable/10/usr.sbin/zic/zdump/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/usr.sbin/zic/zdump/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -7,7 +7,7 @@ MAN= zdump.8 SRCS= zdump.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS -CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir +CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime WARNS?= 2 Modified: stable/10/usr.sbin/zic/zic/Makefile ============================================================================== --- stable/10/usr.sbin/zic/zic/Makefile Fri Dec 4 18:20:55 2015 (r291793) +++ stable/10/usr.sbin/zic/zic/Makefile Fri Dec 4 18:21:05 2015 (r291794) @@ -7,7 +7,7 @@ MAN= zic.8 SRCS= zic.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS -CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir +CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512041821.tB4IL5if019477>