Module Name: src
Committed By: roy
Date: Mon Apr 11 10:43:24 UTC 2016
Modified Files:
src/external/bsd/openresolv/sbin/resolvconf: Makefile
Log Message:
Fix build for operesolv-3.8.0
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openresolv/sbin/resolvconf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/sbin/resolvconf/Makefile
diff -u src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.6 src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.7
--- src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.6 Fri Jul 12 17:32:47 2013
+++ src/external/bsd/openresolv/sbin/resolvconf/Makefile Mon Apr 11 10:43:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/07/12 17:32:47 roy Exp $
+# $NetBSD: Makefile,v 1.7 2016/04/11 10:43:24 roy Exp $
#
.include <bsd.own.mk>
@@ -20,9 +20,6 @@ MAN= resolvconf.conf.5 resolvconf.8
CLEANFILES= ${SCRIPTS} ${FILES} ${MAN}
-CMD1= \1 status >/dev/null 2>\&1
-CMD2= \1 restart
-RESTARTCMD= if /etc/rc.d/${CMD1}; then /etc/rc.d/${CMD2}; fi
.for f in ${SCRIPTS} ${FILES} ${MAN}
${f}: Makefile ${f}.in
${TOOL_SED} -e 's:@PREFIX@::g' \
@@ -31,7 +28,8 @@ ${f}: Makefile ${f}.in
-e 's:@SYSCONFDIR@:/etc:g' \
-e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \
-e 's:@VARDIR@:/var/run/resolvconf:g' \
- -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g' \
+ -e 's:@RESTARTCMD@::g' \
+ -e 's:@STATUSARG@::g' \
${DIST}/${f}.in > $@
.endfor
