d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LIBEXECDIR for /usr/libexec.

Browse Source 
MFC after:	1 week
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-11-26 01:14:40 +00:00
parent 93e779a26c
commit 7fdd45b091
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/usr.bin/cc/cc1/Makefile
View File

@ -9,7 +9,7 @@ MAN=
PROG= cc1 PROG= cc1
SRCS= main.c c-parser.c c-lang.c SRCS= main.c c-parser.c c-lang.c
BINDIR= /usr/libexec BINDIR= ${LIBEXECDIR}
.if ${MK_SHARED_TOOLCHAIN} == "no" .if ${MK_SHARED_TOOLCHAIN} == "no"
NO_SHARED?=yes NO_SHARED?=yes
.endif .endif

2
gnu/usr.bin/cc/cc1plus/Makefile
View File

@ -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 \ search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
cp-objcp-common.c cp-gimplify.c tree-mudflap.c cp-objcp-common.c cp-gimplify.c tree-mudflap.c
BINDIR= /usr/libexec BINDIR= ${LIBEXECDIR}
.if ${MK_SHARED_TOOLCHAIN} == "no" .if ${MK_SHARED_TOOLCHAIN} == "no"
NO_SHARED?=yes NO_SHARED?=yes
.endif .endif

2
lib/libwrap/Makefile
View File

@ -17,7 +17,7 @@ MLINKS= hosts_access.3 hosts_ctl.3 \
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \ 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 \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS

2
libexec/hyperv/Makefile
View File

@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../contrib/hyperv/tools/scripts .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 SCRIPTS= hv_set_ifconfig hv_get_dns_info hv_get_dhcp_info

2
libexec/rtld-elf/Makefile
View File

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

2
libexec/tcpd/Makefile
View File

@ -7,7 +7,7 @@
PROG= tcpd PROG= tcpd
MAN= tcpd.8 MAN= tcpd.8
CSTD?= c89 CSTD?= c89
CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
-DFACILITY=LOG_DAEMON -DFACILITY=LOG_DAEMON

2
usr.bin/makewhatis/Makefile
View File

@ -4,7 +4,7 @@ PROG= makewhatis
LIBADD= z LIBADD= z
SCRIPTS= makewhatis.local.sh SCRIPTS= makewhatis.local.sh
MAN= makewhatis.1 makewhatis.local.8 MAN= makewhatis.1 makewhatis.local.8
SCRIPTSDIR= /usr/libexec SCRIPTSDIR= ${LIBEXECDIR}
LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local
MLINKS= makewhatis.local.8 catman.local.8 MLINKS= makewhatis.local.8 catman.local.8

2
usr.bin/vgrind/Makefile
View File

@ -13,7 +13,7 @@ MAN= vgrind.1 vgrindefs.5
WARNS?= 3 WARNS?= 3
BINDIR= /usr/libexec BINDIR= ${LIBEXECDIR}
SCRIPTSDIR=/usr/bin SCRIPTSDIR=/usr/bin
CLEANFILES= vgrindefs.src.db CLEANFILES= vgrindefs.src.db

2
usr.bin/xlint/lint1/Makefile
View File

@ -11,7 +11,7 @@ LIBADD= l m
CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I. -I${.CURDIR}
LINTFLAGS=-aehpz LINTFLAGS=-aehpz
BINDIR= /usr/libexec BINDIR= ${LIBEXECDIR}
.PATH: ${.CURDIR}/../common .PATH: ${.CURDIR}/../common

2
usr.bin/xlint/lint2/Makefile
View File

@ -9,6 +9,6 @@ MAN=
CFLAGS+=-I${.CURDIR}/../lint1 CFLAGS+=-I${.CURDIR}/../lint1
LINTFLAGS=-abehrz LINTFLAGS=-abehrz
BINDIR= /usr/libexec BINDIR= ${LIBEXECDIR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/bsdinstall/distextract/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
BINDIR= /usr/libexec/bsdinstall BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract PROG= distextract
LIBADD= archive dpv figpar ncursesw dialog m LIBADD= archive dpv figpar ncursesw dialog m

2
usr.sbin/bsdinstall/distfetch/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
BINDIR= /usr/libexec/bsdinstall BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch PROG= distfetch
LIBADD= fetch ncursesw dialog m LIBADD= fetch ncursesw dialog m

2
usr.sbin/bsdinstall/partedit/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
BINDIR= /usr/libexec/bsdinstall BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= partedit PROG= partedit
LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
${BINDIR}/partedit ${BINDIR}/scriptedpart ${BINDIR}/partedit ${BINDIR}/scriptedpart

2
usr.sbin/bsdinstall/scripts/Makefile
View File

@ -3,7 +3,7 @@
SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \ SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \ keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
rootpass script services time umount wlanconfig zfsboot rootpass script services time umount wlanconfig zfsboot
BINDIR= /usr/libexec/bsdinstall BINDIR= ${LIBEXECDIR}/bsdinstall
MAN= MAN=

2
usr.sbin/lpr/filters/Makefile
View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$ # $FreeBSD$
BINDIR= /usr/libexec/lpr BINDIR= ${LIBEXECDIR}/lpr
PROG= lpf PROG= lpf
MAN= MAN=

2
usr.sbin/rpc.yppasswdd/Makefile
View File

@ -7,7 +7,7 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc
PROG= rpc.yppasswdd PROG= rpc.yppasswdd
SCRIPTS=yppwupdate SCRIPTS=yppwupdate
SCRIPTSDIR= /usr/libexec SCRIPTSDIR= ${LIBEXECDIR}
MAN= rpc.yppasswdd.8 MAN= rpc.yppasswdd.8
SRCS= util.c yp_access.c yp_dblookup.c yp_dbwrite.c \ 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} yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS}

2
usr.sbin/sendmail/Makefile
View File

@ -7,7 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src SMDIR= ${SENDMAIL_DIR}/src
.PATH: ${SMDIR} .PATH: ${SMDIR}
BINDIR= /usr/libexec/sendmail BINDIR= ${LIBEXECDIR}/sendmail
PROG= sendmail PROG= sendmail
MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 MAN= mailq.1 newaliases.1 aliases.5 sendmail.8

2
usr.sbin/tcpdchk/Makefile
View File

@ -8,7 +8,7 @@ PROG= tcpdchk
MAN= tcpdchk.8 MAN= tcpdchk.8
SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c 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 \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
.if ${MK_INET6_SUPPORT} != "no" .if ${MK_INET6_SUPPORT} != "no"

2
usr.sbin/tcpdmatch/Makefile
View File

@ -8,7 +8,7 @@ PROG= tcpdmatch
MAN= tcpdmatch.8 MAN= tcpdmatch.8
SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c 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 -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10
.if ${MK_INET6_SUPPORT} != "no" .if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6 CFLAGS+=-DINET6