diff options
| author | olgeni <olgeni@FreeBSD.org> | 2001-02-28 05:48:19 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2001-02-28 05:48:19 +0800 |
| commit | 8685aed451d7717ab96a255dfd69ed9a4d158727 (patch) | |
| tree | 62d3f6f0254ab566a321036510034fb2ec18350e /sysutils | |
| parent | 18c152e746af387cdec56468977dfe715a0a9a3f (diff) | |
| download | freebsd-ports-gnome-8685aed451d7717ab96a255dfd69ed9a4d158727.tar.gz freebsd-ports-gnome-8685aed451d7717ab96a255dfd69ed9a4d158727.tar.zst freebsd-ports-gnome-8685aed451d7717ab96a255dfd69ed9a4d158727.zip | |
Fix for repeated "make install/deinstall" (development only).
Don't ${MV} /tmp/webmin.sh to ${PREFIX}/etc/rc.d: create it in ${WRKDIR}
instead, and use ${CP}.
If you move webmin.sh, you can't make install/deinstall/install: the last
install will fail because of the missing file. No user visible changes, but
speeds up testing.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/webmin/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/webmin/scripts/pre-configure | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index bc602974f1b5..b7554f2c3ecf 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -22,6 +22,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SSL NO_BUILD= yes IS_INTERACTIVE= yes USE_PERL5= yes +SCRIPTS_ENV+= WRKDIR="${WRKDIR}" .if defined(WITH_UPDATES) WEBMIN_MODULES= apache.wbm.gz mysql.wbm.gz status.wbm.gz file.wbm.gz @@ -68,7 +69,7 @@ do-install: @cd ${PREFIX}/lib/webmin && find . -name "*.orig" -print \ | xargs ${RM} @cd ${PREFIX}/lib/webmin && ./setup.sh - @${MV} /tmp/webmin.sh ${PREFIX}/etc/rc.d/webmin.sh + @${CP} ${WRKDIR}/webmin.sh ${PREFIX}/etc/rc.d/webmin.sh @${CHMOD} 554 ${PREFIX}/etc/rc.d/webmin.sh post-install: diff --git a/sysutils/webmin/scripts/pre-configure b/sysutils/webmin/scripts/pre-configure index b69c9556b938..d620e4227e06 100644 --- a/sysutils/webmin/scripts/pre-configure +++ b/sysutils/webmin/scripts/pre-configure @@ -10,6 +10,6 @@ fi perl -pi -e "s=!!PERL5!!=$PERL5=" ${WRKSRC}/setup.sh -sed -e "s=!!PREFIX!!=$PREFIX=" < ${FILESDIR}/webmin.sh.sample > /tmp/webmin.sh +sed -e "s=!!PREFIX!!=$PREFIX=" < ${FILESDIR}/webmin.sh.sample > ${WRKDIR}/webmin.sh exit 0 |