From owner-svn-src-head@FreeBSD.ORG  Fri Aug 24 06:55:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37892106564A;
	Fri, 24 Aug 2012 06:55:17 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 22BFC8FC08;
	Fri, 24 Aug 2012 06:55:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7O6tGTs086538;
	Fri, 24 Aug 2012 06:55:16 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7O6tG6Y086536;
	Fri, 24 Aug 2012 06:55:16 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201208240655.q7O6tG6Y086536@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 24 Aug 2012 06:55:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239640 - head/gnu/usr.bin/groff/tmac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 06:55:17 -0000

Author: ru
Date: Fri Aug 24 06:55:16 2012
New Revision: 239640
URL: http://svn.freebsd.org/changeset/base/239640

Log:
  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>

Modified:
  head/gnu/usr.bin/groff/tmac/Makefile

Modified: head/gnu/usr.bin/groff/tmac/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/tmac/Makefile	Fri Aug 24 05:36:37 2012	(r239639)
+++ head/gnu/usr.bin/groff/tmac/Makefile	Fri Aug 24 06:55:16 2012	(r239640)
@@ -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