Author: bdrewery
Date: Tue Oct 27 23:35:02 2015
New Revision: 290083
URL: https://svnweb.freebsd.org/changeset/base/290083
Log:
Use more appropriate ${SHAREDIR} rather than /usr/share.
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/Makefile
head/sbin/atm/atmconfig/Makefile
head/share/colldef/Makefile
head/share/examples/smbfs/Makefile
head/share/examples/smbfs/print/Makefile
head/share/keys/pkg/trusted/Makefile
head/share/mklocale/Makefile
head/share/monetdef/Makefile
head/share/msgdef/Makefile
head/share/numericdef/Makefile
head/share/sendmail/Makefile
head/share/skel/Makefile
head/share/timedef/Makefile
head/usr.bin/vi/catalog/Makefile
head/usr.sbin/ndiscvt/Makefile
head/usr.sbin/zic/zdump/Makefile
head/usr.sbin/zic/zic/Makefile
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Tue Oct 27 23:11:22 2015 (r290082)
+++ head/etc/Makefile Tue Oct 27 23:35:02 2015 (r290083)
@@ -394,26 +394,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
@@ -421,7 +421,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
@@ -429,8 +429,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: head/sbin/atm/atmconfig/Makefile
==============================================================================
--- head/sbin/atm/atmconfig/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/sbin/atm/atmconfig/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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}
@@ -31,7 +31,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: head/share/colldef/Makefile
==============================================================================
--- head/share/colldef/Makefile Tue Oct 27 23:11:22 2015 (r290082)
+++ head/share/colldef/Makefile Tue Oct 27 23:35:02 2015 (r290083)
@@ -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: head/share/examples/smbfs/Makefile
==============================================================================
--- head/share/examples/smbfs/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/examples/smbfs/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/share/examples/smbfs/print/Makefile
==============================================================================
--- head/share/examples/smbfs/print/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/examples/smbfs/print/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/share/keys/pkg/trusted/Makefile
==============================================================================
--- head/share/keys/pkg/trusted/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/keys/pkg/trusted/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/share/mklocale/Makefile
==============================================================================
--- head/share/mklocale/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/mklocale/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -30,7 +30,7 @@ LOCALES= UTF-8 \
zh_HK.Big5HKSCS \
zh_TW.Big5
-LOCALEDIR= /usr/share/locale
+LOCALEDIR= ${SHAREDIR}/locale
.SUFFIXES: .src .out
Modified: head/share/monetdef/Makefile
==============================================================================
--- head/share/monetdef/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/monetdef/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/share/msgdef/Makefile
==============================================================================
--- head/share/msgdef/Makefile Tue Oct 27 23:11:22 2015 (r290082)
+++ head/share/msgdef/Makefile Tue Oct 27 23:35:02 2015 (r290083)
@@ -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: head/share/numericdef/Makefile
==============================================================================
--- head/share/numericdef/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/numericdef/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/share/sendmail/Makefile
==============================================================================
--- head/share/sendmail/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/share/sendmail/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies'')
Modified: head/share/skel/Makefile
==============================================================================
--- head/share/skel/Makefile Tue Oct 27 23:11:22 2015 (r290082)
+++ head/share/skel/Makefile Tue Oct 27 23:35:02 2015 (r290083)
@@ -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
Modified: head/share/timedef/Makefile
==============================================================================
--- head/share/timedef/Makefile Tue Oct 27 23:11:22 2015 (r290082)
+++ head/share/timedef/Makefile Tue Oct 27 23:35:02 2015 (r290083)
@@ -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: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/usr.bin/vi/catalog/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/usr.sbin/ndiscvt/Makefile
==============================================================================
--- head/usr.sbin/ndiscvt/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/usr.sbin/ndiscvt/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -23,7 +23,7 @@ CLEANFILES= y.output
FILES= windrv_stub.c
FILESNAME= windrv_stub.c
-FILESDIR= /usr/share/misc
+FILESDIR= ${SHAREDIR}/misc
SCRIPTS= ndisgen.sh
Modified: head/usr.sbin/zic/zdump/Makefile
==============================================================================
--- head/usr.sbin/zic/zdump/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/usr.sbin/zic/zdump/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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: head/usr.sbin/zic/zic/Makefile
==============================================================================
--- head/usr.sbin/zic/zic/Makefile Tue Oct 27 23:11:22 2015
(r290082)
+++ head/usr.sbin/zic/zic/Makefile Tue Oct 27 23:35:02 2015
(r290083)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
