From 19897803d4be1a89bcd7129a3b1f217264e09d39 Mon Sep 17 00:00:00 2001 From: ceriel Date: Wed, 1 Jul 1987 13:15:52 +0000 Subject: [PATCH] pass EMHOME on to nested make --- lang/m2/comp/Makefile | 4 ++-- lang/m2/comp/Resolve | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/m2/comp/Makefile b/lang/m2/comp/Makefile index ab5dc3701..904dbbe8c 100644 --- a/lang/m2/comp/Makefile +++ b/lang/m2/comp/Makefile @@ -52,7 +52,7 @@ NEXTFILES = def.H type.H node.H scope.C tmpvar.C casestat.C #EXCLEXCLEXCLEXCL all: Cfiles - sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make $(CURRDIR)/main ; else sh Resolve main ; fi' + sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) $(CURRDIR)/main ; else EMHOME=$(EMHOME); export EMHOME; sh Resolve main ; fi' @rm -f nmclash.o a.out install: all @@ -77,7 +77,7 @@ clean: (cd .. ; rm -rf Xsrc) lint: Cfiles - sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make Xlint ; else sh Resolve Xlint ; fi' + sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) Xlint ; else EMHOME=$(EMHOME); export EMHOME; sh Resolve Xlint ; fi' @rm -f nmclash.o a.out longnames: $(SRC) $(HFILES) diff --git a/lang/m2/comp/Resolve b/lang/m2/comp/Resolve index 388b55dfa..cca848823 100755 --- a/lang/m2/comp/Resolve +++ b/lang/m2/comp/Resolve @@ -23,7 +23,7 @@ then : else mkdir ../Xsrc fi -make longnames +make EMHOME=$EMHOME longnames : remove code generating routines from the clashes list as they are defines. : code generating routine names start with C_ sed '/^C_/d' < longnames > tmp$$ @@ -51,4 +51,4 @@ $i: clashes $PW/$i \$(CID) -Fclashes < $PW/$i > $i EOF done -make CURRDIR=$currdir $target +make EMHOME=$EMHOME CURRDIR=$currdir $target