Date: Thu, 26 Nov 2015 01:14:40 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291348 - in head: 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/xlint... Message-ID: <201511260114.tAQ1Eexi002634@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Nov 26 01:14:40 2015 New Revision: 291348 URL: https://svnweb.freebsd.org/changeset/base/291348 Log: Use LIBEXECDIR for /usr/libexec. MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/gnu/usr.bin/cc/cc1/Makefile head/gnu/usr.bin/cc/cc1plus/Makefile head/lib/libwrap/Makefile head/libexec/hyperv/Makefile head/libexec/rtld-elf/Makefile head/libexec/tcpd/Makefile head/usr.bin/makewhatis/Makefile head/usr.bin/vgrind/Makefile head/usr.bin/xlint/lint1/Makefile head/usr.bin/xlint/lint2/Makefile head/usr.sbin/bsdinstall/distextract/Makefile head/usr.sbin/bsdinstall/distfetch/Makefile head/usr.sbin/bsdinstall/partedit/Makefile head/usr.sbin/bsdinstall/scripts/Makefile head/usr.sbin/lpr/filters/Makefile head/usr.sbin/rpc.yppasswdd/Makefile head/usr.sbin/sendmail/Makefile head/usr.sbin/tcpdchk/Makefile head/usr.sbin/tcpdmatch/Makefile Modified: head/gnu/usr.bin/cc/cc1/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc1/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/gnu/usr.bin/cc/cc1/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/gnu/usr.bin/cc/cc1plus/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc1plus/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/gnu/usr.bin/cc/cc1plus/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/lib/libwrap/Makefile ============================================================================== --- head/lib/libwrap/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/lib/libwrap/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/libexec/hyperv/Makefile ============================================================================== --- head/libexec/hyperv/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/libexec/hyperv/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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 Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/libexec/rtld-elf/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/libexec/tcpd/Makefile ============================================================================== --- head/libexec/tcpd/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/libexec/tcpd/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/usr.bin/makewhatis/Makefile ============================================================================== --- head/usr.bin/makewhatis/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.bin/makewhatis/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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 Modified: head/usr.bin/vgrind/Makefile ============================================================================== --- head/usr.bin/vgrind/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.bin/vgrind/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -13,7 +13,7 @@ MAN= vgrind.1 vgrindefs.5 WARNS?= 3 -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} SCRIPTSDIR=/usr/bin CLEANFILES= vgrindefs.src.db Modified: head/usr.bin/xlint/lint1/Makefile ============================================================================== --- head/usr.bin/xlint/lint1/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.bin/xlint/lint1/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -11,7 +11,7 @@ LIBADD= l m CFLAGS+= -I. -I${.CURDIR} LINTFLAGS=-aehpz -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .PATH: ${.CURDIR}/../common Modified: head/usr.bin/xlint/lint2/Makefile ============================================================================== --- head/usr.bin/xlint/lint2/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.bin/xlint/lint2/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -9,6 +9,6 @@ MAN= CFLAGS+=-I${.CURDIR}/../lint1 LINTFLAGS=-abehrz -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .include <bsd.prog.mk> Modified: head/usr.sbin/bsdinstall/distextract/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/distextract/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/bsdinstall/distextract/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract LIBADD= archive dpv figpar ncursesw dialog m Modified: head/usr.sbin/bsdinstall/distfetch/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/distfetch/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/bsdinstall/distfetch/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch LIBADD= fetch ncursesw dialog m Modified: head/usr.sbin/bsdinstall/partedit/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/partedit/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/bsdinstall/partedit/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart Modified: head/usr.sbin/bsdinstall/scripts/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/scripts/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/bsdinstall/scripts/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/usr.sbin/lpr/filters/Makefile ============================================================================== --- head/usr.sbin/lpr/filters/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/lpr/filters/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -BINDIR= /usr/libexec/lpr +BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= Modified: head/usr.sbin/rpc.yppasswdd/Makefile ============================================================================== --- head/usr.sbin/rpc.yppasswdd/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/rpc.yppasswdd/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/usr.sbin/sendmail/Makefile ============================================================================== --- head/usr.sbin/sendmail/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/sendmail/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/usr.sbin/tcpdchk/Makefile ============================================================================== --- head/usr.sbin/tcpdchk/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/tcpdchk/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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: head/usr.sbin/tcpdmatch/Makefile ============================================================================== --- head/usr.sbin/tcpdmatch/Makefile Thu Nov 26 01:14:27 2015 (r291347) +++ head/usr.sbin/tcpdmatch/Makefile Thu Nov 26 01:14:40 2015 (r291348) @@ -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?201511260114.tAQ1Eexi002634>