A workaround in r238563 was for makes (notably bmake) without the

internal knowledge that "cd" is a shell's built-in.  Such makes
may attempt to exec() "cd" that in turn will fail on systems that
lack the "cd" executable.

Reworked this by eliminating the root cause.

Submitted by:	Simon Gerraty <sjg@juniper.net>
This commit is contained in:
Ruslan Ermilov 2012-08-24 06:55:16 +00:00
parent 54798be082
commit 61fcb6bec9

View File

@ -62,13 +62,12 @@ $f-s: $f
.endfor
beforeinstall:
cd ${DIST_DIR}; \
(cd ${DIST_DIR} && \
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${NORMALFILES} ${DESTDIR}${TMACDIR}
cd ${.CURDIR}; \
${NORMALFILES} ${DESTDIR}${TMACDIR})
(cd ${.CURDIR} && \
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR}
cd ${.OBJDIR};
koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR})
.for f in ${STRIPFILES} ${SPECIALFILES}
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
$f-s ${DESTDIR}${TMACDIR}/$f