pass EMHOME on to nested make

diff --git a/lang/m2/comp/Makefile b/lang/m2/comp/Makefile
index ab5dc37..904dbbe 100644 (file)
--- 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 388b55d..cca8488 100755 (executable)
--- 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