diff options
author | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
commit | 8eb37231d4405088a481324c2ec41ac851e8d8f7 (patch) | |
tree | dc80da53186aab7c56424c2574b0cd7928930721 /bin/sh | |
parent | 3acbd3cce674dab9a0afdee1f6e50196f4585ffa (diff) | |
download | FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.zip FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.tar.gz |
Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.
Diffstat (limited to 'bin/sh')
-rw-r--r-- | bin/sh/Makefile | 4 | ||||
-rwxr-xr-x | bin/sh/mkbuiltins | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 37a3d95..cacba41 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.9 1996/02/03 13:27:54 joerg Exp $ +# $Id: Makefile,v 1.11 1996/06/02 17:06:39 phk Exp $ PROG= sh SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \ @@ -27,7 +27,7 @@ ${.CURDIR}/builtins: # just override the default rule builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins - cd ${.CURDIR}; sh mkbuiltins + cd ${.CURDIR} && env OBJDIR=${.OBJDIR} sh mkbuiltins init.c: mkinit ${SRCS} ./mkinit '${CC} -c ${CFLAGS} ${LDFLAGS} init.c' ${.ALLSRC} diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins index e7f0d8d..104ded6 100755 --- a/bin/sh/mkbuiltins +++ b/bin/sh/mkbuiltins @@ -35,15 +35,15 @@ # SUCH DAMAGE. # # @(#)mkbuiltins 8.1 (Berkeley) 5/31/93 -# $Id: mkbuiltins,v 1.2 1994/09/24 02:57:53 davidg Exp $ +# $Id: mkbuiltins,v 1.3 1995/03/30 19:45:20 phk Exp $ temp=/tmp/ka$$ havejobs=0 if grep '^#define JOBS[ ]*1' shell.h > /dev/null then havejobs=1 fi -if [ -d obj ] ; then - exec > obj/builtins.c +if [ -d ${OBJDIR} ] ; then + exec > ${OBJDIR}/builtins.c else exec > builtins.c fi @@ -71,8 +71,8 @@ awk '{ for (i = 2 ; i <= NF ; i++) { echo ' NULL, 0 };' -if [ -d obj ] ; then - exec > obj/builtins.h +if [ -d ${OBJDIR} ] ; then + exec > ${OBJDIR}/builtins.h else exec > builtins.h fi |