Date: Fri, 4 Dec 2015 19:16:56 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r291819 - in stable/10: gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus lib/libwrap libexec/hyperv libexec/rtld-elf libexec/tcpd usr.bin/makewhatis usr.bin/vgrind usr.bin/xlint/lint1 usr.bin/... Message-ID: <201512041916.tB4JGu5x038267@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Dec 4 19:16:56 2015 New Revision: 291819 URL: https://svnweb.freebsd.org/changeset/base/291819 Log: MFC r291348: Use LIBEXECDIR for /usr/libexec. Modified: stable/10/gnu/usr.bin/cc/cc1/Makefile stable/10/gnu/usr.bin/cc/cc1plus/Makefile stable/10/lib/libwrap/Makefile stable/10/libexec/hyperv/Makefile stable/10/libexec/rtld-elf/Makefile stable/10/libexec/tcpd/Makefile stable/10/usr.bin/makewhatis/Makefile stable/10/usr.bin/vgrind/Makefile stable/10/usr.bin/xlint/lint1/Makefile stable/10/usr.bin/xlint/lint2/Makefile stable/10/usr.sbin/bsdinstall/distextract/Makefile stable/10/usr.sbin/bsdinstall/distfetch/Makefile stable/10/usr.sbin/bsdinstall/partedit/Makefile stable/10/usr.sbin/bsdinstall/scripts/Makefile stable/10/usr.sbin/lpr/filters/Makefile stable/10/usr.sbin/rpc.yppasswdd/Makefile stable/10/usr.sbin/sendmail/Makefile stable/10/usr.sbin/tcpdchk/Makefile stable/10/usr.sbin/tcpdmatch/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/gnu/usr.bin/cc/cc1/Makefile ============================================================================== --- stable/10/gnu/usr.bin/cc/cc1/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/gnu/usr.bin/cc/cc1/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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 Modified: stable/10/gnu/usr.bin/cc/cc1plus/Makefile ============================================================================== --- stable/10/gnu/usr.bin/cc/cc1plus/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/gnu/usr.bin/cc/cc1plus/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -15,7 +15,7 @@ SRCS+= main.c cp-lang.c c-opts.c call.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 Modified: stable/10/lib/libwrap/Makefile ============================================================================== --- stable/10/lib/libwrap/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/lib/libwrap/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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 Modified: stable/10/libexec/hyperv/Makefile ============================================================================== --- stable/10/libexec/hyperv/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/libexec/hyperv/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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= Modified: stable/10/libexec/rtld-elf/Makefile ============================================================================== --- stable/10/libexec/rtld-elf/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/libexec/rtld-elf/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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 Modified: stable/10/libexec/tcpd/Makefile ============================================================================== --- stable/10/libexec/tcpd/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/libexec/tcpd/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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 Modified: stable/10/usr.bin/makewhatis/Makefile ============================================================================== --- stable/10/usr.bin/makewhatis/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.bin/makewhatis/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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 Modified: stable/10/usr.bin/vgrind/Makefile ============================================================================== --- stable/10/usr.bin/vgrind/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.bin/vgrind/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -13,7 +13,7 @@ MAN= vgrind.1 vgrindefs.5 WARNS?= 3 -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} SCRIPTSDIR=/usr/bin CLEANFILES= vgrindefs.src.db Modified: stable/10/usr.bin/xlint/lint1/Makefile ============================================================================== --- stable/10/usr.bin/xlint/lint1/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.bin/xlint/lint1/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -12,7 +12,7 @@ DPADD= ${LIBL} ${LIBM} CFLAGS+= -I. -I${.CURDIR} LINTFLAGS=-aehpz -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .PATH: ${.CURDIR}/../common Modified: stable/10/usr.bin/xlint/lint2/Makefile ============================================================================== --- stable/10/usr.bin/xlint/lint2/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.bin/xlint/lint2/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -9,6 +9,6 @@ MAN= CFLAGS+=-I${.CURDIR}/../lint1 LINTFLAGS=-abehrz -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .include <bsd.prog.mk> Modified: stable/10/usr.sbin/bsdinstall/distextract/Makefile ============================================================================== --- stable/10/usr.sbin/bsdinstall/distextract/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/bsdinstall/distextract/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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 Modified: stable/10/usr.sbin/bsdinstall/distfetch/Makefile ============================================================================== --- stable/10/usr.sbin/bsdinstall/distfetch/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/bsdinstall/distfetch/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch DPADD= ${LIBFETCH} ${LIBDIALOG} ${LIBM} LDADD= -lfetch -ldialog -lm Modified: stable/10/usr.sbin/bsdinstall/partedit/Makefile ============================================================================== --- stable/10/usr.sbin/bsdinstall/partedit/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/bsdinstall/partedit/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart Modified: stable/10/usr.sbin/bsdinstall/scripts/Makefile ============================================================================== --- stable/10/usr.sbin/bsdinstall/scripts/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/bsdinstall/scripts/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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= Modified: stable/10/usr.sbin/lpr/filters/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/filters/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/lpr/filters/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -BINDIR= /usr/libexec/lpr +BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= Modified: stable/10/usr.sbin/rpc.yppasswdd/Makefile ============================================================================== --- stable/10/usr.sbin/rpc.yppasswdd/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/rpc.yppasswdd/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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} Modified: stable/10/usr.sbin/sendmail/Makefile ============================================================================== --- stable/10/usr.sbin/sendmail/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/sendmail/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -7,7 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/se SMDIR= ${SENDMAIL_DIR}/src .PATH: ${SMDIR} -BINDIR= /usr/libexec/sendmail +BINDIR= ${LIBEXECDIR}/sendmail PROG= sendmail MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 Modified: stable/10/usr.sbin/tcpdchk/Makefile ============================================================================== --- stable/10/usr.sbin/tcpdchk/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/tcpdchk/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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" Modified: stable/10/usr.sbin/tcpdmatch/Makefile ============================================================================== --- stable/10/usr.sbin/tcpdmatch/Makefile Fri Dec 4 19:15:36 2015 (r291818) +++ stable/10/usr.sbin/tcpdmatch/Makefile Fri Dec 4 19:16:56 2015 (r291819) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512041916.tB4JGu5x038267>