aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-11-26 01:14:40 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-11-26 01:14:40 +0000
commit7fdd45b0913882a815552e5a43e25e2a99b018ff (patch)
treeab6424837d4c96879048392db76885f0a2a3129c
parent93e779a26c651610ac6e7986d67ecc9ed2cadcbf (diff)
downloadsrc-7fdd45b0913882a815552e5a43e25e2a99b018ff.tar.gz
src-7fdd45b0913882a815552e5a43e25e2a99b018ff.zip
Use LIBEXECDIR for /usr/libexec.
MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=291348
-rw-r--r--gnu/usr.bin/cc/cc1/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile2
-rw-r--r--lib/libwrap/Makefile2
-rw-r--r--libexec/hyperv/Makefile2
-rw-r--r--libexec/rtld-elf/Makefile2
-rw-r--r--libexec/tcpd/Makefile2
-rw-r--r--usr.bin/makewhatis/Makefile2
-rw-r--r--usr.bin/vgrind/Makefile2
-rw-r--r--usr.bin/xlint/lint1/Makefile2
-rw-r--r--usr.bin/xlint/lint2/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile2
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile2
-rw-r--r--usr.sbin/bsdinstall/scripts/Makefile2
-rw-r--r--usr.sbin/lpr/filters/Makefile2
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile2
-rw-r--r--usr.sbin/sendmail/Makefile2
-rw-r--r--usr.sbin/tcpdchk/Makefile2
-rw-r--r--usr.sbin/tcpdmatch/Makefile2
19 files changed, 19 insertions, 19 deletions
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 368517c1be00..b306bfec2e12 100644
--- 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
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 5d5a64d2e298..761dd699bdd3 100644
--- 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
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 7c2ca9a5535e..0acb0c4c8da7 100644
--- 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
diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile
index 6d95c334ff93..a8414771d8ab 100644
--- 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
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 8758c8d828b7..5667299cc4e3 100644
--- 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
diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile
index 03e8c52069af..45add0bd95c8 100644
--- 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
diff --git a/usr.bin/makewhatis/Makefile b/usr.bin/makewhatis/Makefile
index ba0e1ee7decd..10109496e4e2 100644
--- a/usr.bin/makewhatis/Makefile
+++ b/usr.bin/makewhatis/Makefile
@@ -4,7 +4,7 @@ PROG= makewhatis
LIBADD= z
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
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 06d905239cb6..a7dc9a185322 100644
--- 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
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 2d6539eb4b2a..6792ba085f6d 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -11,7 +11,7 @@ LIBADD= l m
CFLAGS+= -I. -I${.CURDIR}
LINTFLAGS=-aehpz
-BINDIR= /usr/libexec
+BINDIR= ${LIBEXECDIR}
.PATH: ${.CURDIR}/../common
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index 8f4a4ad52989..ad14d2abf293 100644
--- 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>
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 313ec00902f6..d3008f6e6271 100644
--- 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
LIBADD= archive dpv figpar ncursesw dialog m
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 5c0f6e826bc1..1620c9b880df 100644
--- 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
LIBADD= fetch ncursesw dialog m
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index d48f777343eb..21d842e3fe4a 100644
--- 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
diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index efe9700fbfcb..c0d6ac29f6bb 100644
--- 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=
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index f1bc58643ebc..7976752d0df0 100644
--- 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=
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 5f5fb773c065..9b2fb395cb7a 100644
--- 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}
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 80ce13b94969..f9641c1675d8 100644
--- 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
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 5faea18a3af4..c7d415500e48 100644
--- 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"
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index bbe29a458627..2f924276936a 100644
--- 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