diff options
| author | badger <badger@FreeBSD.org> | 2016-08-31 22:18:50 +0000 |
|---|---|---|
| committer | badger <badger@FreeBSD.org> | 2016-08-31 22:18:50 +0000 |
| commit | ce87e4672c6494487cc6f6d023d21167ef96f526 (patch) | |
| tree | e95fb6b284701589dc349acd8b8c891422d44cd0 | |
| parent | f5388b59e2ab29e05e2ffb7cbccc9536a14ee97a (diff) | |
| download | FreeBSD-src-ce87e4672c6494487cc6f6d023d21167ef96f526.zip FreeBSD-src-ce87e4672c6494487cc6f6d023d21167ef96f526.tar.gz | |
MFC r304652:
Fix missing substitution of @SBINDIR@ in resolvconf scripts
Certain features, such as resolv_conf_passthrough=NULL, do not work
correctly due to this missing substitution.
Also remove the @PREFIX@ substitution, which is no longer needed.
Approved by: vangyzen (mentor)
Sponsored by: Dell Inc.
| -rw-r--r-- | sbin/resolvconf/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index 2d4701e..3025b3a 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -15,6 +15,7 @@ CLEANFILES= ${SCRIPTS} ${FILES} ${MAN} SYSCONFDIR= /etc RCDIR= ${SYSCONFDIR}/rc.d VARDIR= /var/run/resolvconf +SBINDIR= /sbin # We don't assume to restart the services in /sbin. So, though # our service(8) is in /usr/sbin, we can use it, here. @@ -24,12 +25,12 @@ RESTARTCMD= /usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2} .for f in ${SCRIPTS} ${FILES} ${MAN} ${f}: ${f}.in - sed -e 's:@PREFIX@::g' \ - -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \ + sed -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \ -e 's:@LIBEXECDIR@:${FILESDIR}:g' \ -e 's:@VARDIR@:${VARDIR}:g' \ -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g' \ -e 's:@RCDIR@:${RCDIR}:g' \ + -e 's:@SBINDIR@:${SBINDIR}:g' \ -e 's: vpn : ng[0-9]*&:g' \ ${DIST}/$@.in > $@ .endfor |
