From 61fcb6bec97dc7f0052536dc6fcdc8ed2aa48fbd Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 24 Aug 2012 06:55:16 +0000 Subject: [PATCH] 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 --- gnu/usr.bin/groff/tmac/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index f6e09c769d0..195d32fbdcb 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -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