MFC r291348:

Use LIBEXECDIR for /usr/libexec.
2015-12-04 19:16:56 +00:00 · 2015-12-04 19:16:56 +00:00 · 8e2550bfa6
commit 8e2550bfa6
parent afa8b531c2
19 changed files with 19 additions and 19 deletions
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@ -9,7 +9,7 @@ MAN=

 PROG=	cc1
 SRCS=	main.c c-parser.c c-lang.c
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
 .endif
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@ -15,7 +15,7 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
 	search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
 	cp-objcp-common.c cp-gimplify.c tree-mudflap.c

-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
 .endif
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@ -17,7 +17,7 @@ MLINKS=	hosts_access.3 hosts_ctl.3 \
 .PATH:	${.CURDIR}/../../contrib/tcp_wrappers

 CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \
-	-DREAL_DAEMON_DIR=\"/usr/libexec\" -DPROCESS_OPTIONS \
+	-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" -DPROCESS_OPTIONS \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS
--- a/libexec/hyperv/Makefile
+++ b/libexec/hyperv/Makefile
@ -2,7 +2,7 @@

 .PATH:		${.CURDIR}/../../contrib/hyperv/tools/scripts

-BINDIR=		/usr/libexec/hyperv
+BINDIR=		${LIBEXECDIR}/hyperv

 SCRIPTS=	hv_set_ifconfig hv_get_dns_info hv_get_dhcp_info
 NO_OBJ=
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@ -32,7 +32,7 @@ WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
-SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
+SYMLINKS=	${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG}
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1

--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@ -7,7 +7,7 @@
 PROG=	tcpd
 MAN=	tcpd.8
 CSTD?=	c89
-CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
+CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DFACILITY=LOG_DAEMON
--- a/usr.bin/makewhatis/Makefile
+++ b/usr.bin/makewhatis/Makefile
@ -5,7 +5,7 @@ DPADD=		${LIBZ}
 LDADD=		-lz
 SCRIPTS=	makewhatis.local.sh
 MAN=		makewhatis.1 makewhatis.local.8
-SCRIPTSDIR=	/usr/libexec
+SCRIPTSDIR=	${LIBEXECDIR}
 LINKS=		${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local
 MLINKS=		makewhatis.local.8 catman.local.8

--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@ -13,7 +13,7 @@ MAN=	vgrind.1 vgrindefs.5

 WARNS?=	3

-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 SCRIPTSDIR=/usr/bin

 CLEANFILES= vgrindefs.src.db
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@ -12,7 +12,7 @@ DPADD=	${LIBL} ${LIBM}
 CFLAGS+= -I. -I${.CURDIR}
 LINTFLAGS=-aehpz

-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}

 .PATH: ${.CURDIR}/../common

--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@ -9,6 +9,6 @@ MAN=
 CFLAGS+=-I${.CURDIR}/../lint1
 LINTFLAGS=-abehrz

-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}

 .include <bsd.prog.mk>
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distextract
 DPADD=	${LIBARCHIVE} ${LIBDPV} ${LIBFIGPAR} ${LIBDIALOG} ${LIBM}
 LDADD=	-larchive -ldpv -lfigpar -ldialog -lm
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distfetch
 DPADD=	${LIBFETCH} ${LIBDIALOG} ${LIBM}
 LDADD=	-lfetch -ldialog -lm
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	partedit
 LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
       ${BINDIR}/partedit ${BINDIR}/scriptedpart
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@ -3,7 +3,7 @@
 SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
 	 keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
 	 rootpass script services time umount wlanconfig zfsboot
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall

 MAN=

--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$

-BINDIR=	/usr/libexec/lpr
+BINDIR=	${LIBEXECDIR}/lpr

 PROG=	lpf
 MAN=
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@ -7,7 +7,7 @@ RPCDIR=	${DESTDIR}/usr/include/rpcsvc

 PROG=	rpc.yppasswdd
 SCRIPTS=yppwupdate
-SCRIPTSDIR= /usr/libexec
+SCRIPTSDIR= ${LIBEXECDIR}
 MAN=	rpc.yppasswdd.8
 SRCS=	util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
 	yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS}
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@ -7,7 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
 .PATH: ${SMDIR}

-BINDIR=	/usr/libexec/sendmail
+BINDIR=	${LIBEXECDIR}/sendmail

 PROG=	sendmail
 MAN=	mailq.1 newaliases.1 aliases.5 sendmail.8 
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@ -8,7 +8,7 @@ PROG=	tcpdchk
 MAN=	tcpdchk.8
 SRCS=	tcpdchk.c fakelog.c inetcf.c scaffold.c

-CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
+CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
 .if ${MK_INET6_SUPPORT} != "no"
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@ -8,7 +8,7 @@ PROG=	tcpdmatch
 MAN=	tcpdmatch.8
 SRCS=	tcpdmatch.c fakelog.c inetcf.c scaffold.c

-CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
+CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6