Use more appropriate ${SHAREDIR} rather than /usr/share.
MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
87af896340
commit
7d8f797b72
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=290083
20
etc/Makefile
20
etc/Makefile
@ -394,26 +394,26 @@ distrib-dirs: ${MTREES:N/*}
|
|||||||
.endif
|
.endif
|
||||||
${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
|
${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
|
||||||
.if ${MK_MAN} != "no"
|
.if ${MK_MAN} != "no"
|
||||||
cd ${DESTDIR}/usr/share/man; \
|
cd ${DESTDIR}${SHAREDIR}/man; \
|
||||||
for mandir in man*; do \
|
for mandir in man*; do \
|
||||||
${INSTALL_SYMLINK} ../$$mandir \
|
${INSTALL_SYMLINK} ../$$mandir \
|
||||||
${DESTDIR}/usr/share/man/en.ISO8859-1/; \
|
${DESTDIR}${SHAREDIR}/man/en.ISO8859-1/; \
|
||||||
${INSTALL_SYMLINK} ../$$mandir \
|
${INSTALL_SYMLINK} ../$$mandir \
|
||||||
${DESTDIR}/usr/share/man/en.UTF-8/; \
|
${DESTDIR}${SHAREDIR}/man/en.UTF-8/; \
|
||||||
done
|
done
|
||||||
.if ${MK_OPENSSL} != "no"
|
.if ${MK_OPENSSL} != "no"
|
||||||
cd ${DESTDIR}/usr/share/openssl/man; \
|
cd ${DESTDIR}${SHAREDIR}/openssl/man; \
|
||||||
for mandir in man*; do \
|
for mandir in man*; do \
|
||||||
${INSTALL_SYMLINK} ../$$mandir \
|
${INSTALL_SYMLINK} ../$$mandir \
|
||||||
${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
|
${DESTDIR}${SHAREDIR}/openssl/man/en.ISO8859-1/; \
|
||||||
done
|
done
|
||||||
.endif
|
.endif
|
||||||
set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
|
set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
|
||||||
while [ $$# -gt 0 ] ; do \
|
while [ $$# -gt 0 ] ; do \
|
||||||
${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
|
${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/man/$$1"; \
|
||||||
if [ "${MK_OPENSSL}" != "no" ]; then \
|
if [ "${MK_OPENSSL}" != "no" ]; then \
|
||||||
${INSTALL_SYMLINK} "$$2" \
|
${INSTALL_SYMLINK} "$$2" \
|
||||||
"${DESTDIR}/usr/share/openssl/man/$$1"; \
|
"${DESTDIR}${SHAREDIR}/openssl/man/$$1"; \
|
||||||
fi; \
|
fi; \
|
||||||
shift; shift; \
|
shift; shift; \
|
||||||
done
|
done
|
||||||
@ -421,7 +421,7 @@ distrib-dirs: ${MTREES:N/*}
|
|||||||
.if ${MK_NLS} != "no"
|
.if ${MK_NLS} != "no"
|
||||||
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
|
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
|
||||||
while [ $$# -gt 0 ] ; do \
|
while [ $$# -gt 0 ] ; do \
|
||||||
${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
|
${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \
|
||||||
shift; shift; \
|
shift; shift; \
|
||||||
done
|
done
|
||||||
.endif
|
.endif
|
||||||
@ -429,8 +429,8 @@ distrib-dirs: ${MTREES:N/*}
|
|||||||
etc-examples:
|
etc-examples:
|
||||||
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${BIN1} ${BIN2} nsmb.conf opieaccess \
|
${BIN1} ${BIN2} nsmb.conf opieaccess \
|
||||||
${DESTDIR}/usr/share/examples/etc
|
${DESTDIR}${SHAREDIR}/examples/etc
|
||||||
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
|
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
|
||||||
DESTDIR=${DESTDIR}/usr/share/examples
|
DESTDIR=${DESTDIR}${SHAREDIR}/examples
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
PROG= atmconfig
|
PROG= atmconfig
|
||||||
SRCS= main.c diag.c natm.c
|
SRCS= main.c diag.c natm.c
|
||||||
MAN= atmconfig.8
|
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}
|
CFLAGS+= -I${.OBJDIR}
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ WARNS?= 3
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
FILES= atmconfig.help atmconfig_device.help
|
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 \
|
SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \
|
||||||
${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
|
${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
|
||||||
|
@ -42,7 +42,7 @@ LOCALES= bg_BG.CP1251 \
|
|||||||
uk_UA.ISO8859-5 \
|
uk_UA.ISO8859-5 \
|
||||||
uk_UA.KOI8-U
|
uk_UA.KOI8-U
|
||||||
|
|
||||||
LOCALEDIR= /usr/share/locale
|
LOCALEDIR= ${SHAREDIR}/locale
|
||||||
|
|
||||||
.SUFFIXES: .src .out
|
.SUFFIXES: .src .out
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
NO_OBJ=
|
NO_OBJ=
|
||||||
BINDIR= /usr/share/examples/smbfs
|
FILESDIR= ${SHAREDIR}/examples/smbfs
|
||||||
FILES= dot.nsmbrc
|
FILES= dot.nsmbrc
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/../../../contrib/smbfs/examples
|
.PATH: ${.CURDIR}/../../../contrib/smbfs/examples
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
NO_OBJ=
|
NO_OBJ=
|
||||||
BINDIR= /usr/share/examples/smbfs/print
|
FILESDIR= ${SHAREDIR}/examples/smbfs/print
|
||||||
FILES= lj6l ljspool printcap.sample tolj
|
FILES= lj6l ljspool printcap.sample tolj
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print
|
.PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print
|
||||||
|
@ -4,7 +4,7 @@ NO_OBJ=
|
|||||||
|
|
||||||
FILES= pkg.freebsd.org.2013102301
|
FILES= pkg.freebsd.org.2013102301
|
||||||
|
|
||||||
FILESDIR= /usr/share/keys/pkg/trusted
|
FILESDIR= ${SHAREDIR}/keys/pkg/trusted
|
||||||
FILESMODE= 644
|
FILESMODE= 644
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -30,7 +30,7 @@ LOCALES= UTF-8 \
|
|||||||
zh_HK.Big5HKSCS \
|
zh_HK.Big5HKSCS \
|
||||||
zh_TW.Big5
|
zh_TW.Big5
|
||||||
|
|
||||||
LOCALEDIR= /usr/share/locale
|
LOCALEDIR= ${SHAREDIR}/locale
|
||||||
|
|
||||||
.SUFFIXES: .src .out
|
.SUFFIXES: .src .out
|
||||||
|
|
||||||
|
@ -90,7 +90,7 @@ LOCALES= af_ZA.ISO8859-1 \
|
|||||||
zh_HK.UTF-8 \
|
zh_HK.UTF-8 \
|
||||||
zh_TW.Big5
|
zh_TW.Big5
|
||||||
|
|
||||||
LOCALEDIR= /usr/share/locale
|
LOCALEDIR= ${SHAREDIR}/locale
|
||||||
|
|
||||||
.SUFFIXES: .src .out
|
.SUFFIXES: .src .out
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ LOCALES= af_ZA.ISO8859-1 \
|
|||||||
zh_TW.Big5 \
|
zh_TW.Big5 \
|
||||||
zh_TW.UTF-8
|
zh_TW.UTF-8
|
||||||
|
|
||||||
LOCALEDIR= /usr/share/locale
|
LOCALEDIR= ${SHAREDIR}/locale
|
||||||
|
|
||||||
.SUFFIXES: .src .out
|
.SUFFIXES: .src .out
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ LOCALES= af_ZA.ISO8859-1 \
|
|||||||
uk_UA.KOI8-U \
|
uk_UA.KOI8-U \
|
||||||
zh_CN.eucCN
|
zh_CN.eucCN
|
||||||
|
|
||||||
LOCALEDIR= /usr/share/locale
|
LOCALEDIR= ${SHAREDIR}/locale
|
||||||
|
|
||||||
.SUFFIXES: .src .out
|
.SUFFIXES: .src .out
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ CFDIR= cf
|
|||||||
CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print)
|
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)
|
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
|
# Define SHARED to indicate whether you want symbolic links to the system
|
||||||
# source (``symlinks''), or a separate copy (``copies'')
|
# source (``symlinks''), or a separate copy (``copies'')
|
||||||
|
@ -5,8 +5,8 @@ FILESGROUPS= FILES1 FILES2
|
|||||||
FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
|
FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
|
||||||
dot.shrc
|
dot.shrc
|
||||||
FILES2= dot.mail_aliases dot.rhosts
|
FILES2= dot.mail_aliases dot.rhosts
|
||||||
FILES1DIR= /usr/share/skel
|
FILES1DIR= ${SHAREDIR}/skel
|
||||||
FILES2DIR= /usr/share/skel
|
FILES2DIR= ${SHAREDIR}/skel
|
||||||
FILES1MODE= 0644
|
FILES1MODE= 0644
|
||||||
FILES2MODE= 0600
|
FILES2MODE= 0600
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ LOCALES= am_ET.UTF-8 \
|
|||||||
zh_TW.Big5 \
|
zh_TW.Big5 \
|
||||||
zh_TW.UTF-8
|
zh_TW.UTF-8
|
||||||
|
|
||||||
LOCALEDIR= /usr/share/locale
|
LOCALEDIR= ${SHAREDIR}/locale
|
||||||
|
|
||||||
.SUFFIXES: .src .out
|
.SUFFIXES: .src .out
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ SVLINKS= sv_SE
|
|||||||
PLLINKS= pl_PL
|
PLLINKS= pl_PL
|
||||||
|
|
||||||
FILES= ${CATALOGS}
|
FILES= ${CATALOGS}
|
||||||
FILESDIR= /usr/share/vi/catalog
|
FILESDIR= ${SHAREDIR}/vi/catalog
|
||||||
SYMLINKS=
|
SYMLINKS=
|
||||||
.for l in ${NLLINKS}
|
.for l in ${NLLINKS}
|
||||||
SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-1
|
SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-1
|
||||||
|
@ -23,7 +23,7 @@ CLEANFILES= y.output
|
|||||||
|
|
||||||
FILES= windrv_stub.c
|
FILES= windrv_stub.c
|
||||||
FILESNAME= windrv_stub.c
|
FILESNAME= windrv_stub.c
|
||||||
FILESDIR= /usr/share/misc
|
FILESDIR= ${SHAREDIR}/misc
|
||||||
|
|
||||||
SCRIPTS= ndisgen.sh
|
SCRIPTS= ndisgen.sh
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ MAN= zdump.8
|
|||||||
SRCS= zdump.c ialloc.c scheck.c
|
SRCS= zdump.c ialloc.c scheck.c
|
||||||
|
|
||||||
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
|
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
|
CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
|
||||||
|
|
||||||
WARNS?= 2
|
WARNS?= 2
|
||||||
|
@ -7,7 +7,7 @@ MAN= zic.8
|
|||||||
SRCS= zic.c ialloc.c scheck.c
|
SRCS= zic.c ialloc.c scheck.c
|
||||||
|
|
||||||
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
|
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+= -DHAVE_STRERROR -DHAVE_UNISTD_H
|
||||||
CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
|
CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user