d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix from Lindsey: changed CURRDIR mechanism to make it work on SunOs 4.0

Browse source
This commit is contained in:
ceriel 1988-11-24 09:41:39 +00:00
parent 3d6ab89bc1
commit 6a8360b335
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lang/m2/comp/Makefile
View file

@ -9,7 +9,7 @@ LLGEN = $(EMHOME)/bin/LLgen
MKDEP = $(EMHOME)/bin/mkdep MKDEP = $(EMHOME)/bin/mkdep
PRID = $(EMHOME)/bin/prid PRID = $(EMHOME)/bin/prid
CID = $(EMHOME)/bin/cid CID = $(EMHOME)/bin/cid
CURRDIR = . CURRDIR =
LINT = lint LINT = lint
INCLUDES = -I$(MHDIR) -I$(EMHOME)/h -I$(PKGDIR) INCLUDES = -I$(MHDIR) -I$(EMHOME)/h -I$(PKGDIR)
@ -57,30 +57,30 @@ NEXTFILES = def.H type.H node.H desig.H scope.C tmpvar.C casestat.C
#EXCLEXCLEXCLEXCL #EXCLEXCLEXCLEXCL
all: Cfiles all: Cfiles
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' 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 @rm -f nmclash.o a.out
Omain: Cfiles Omain: Cfiles
rm -f *.o rm -f *.o
sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) "COPTIONS="-DPEEPHOLE $(CURRDIR)/omain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve omain ; fi' sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) "COPTIONS="-DPEEPHOLE $(CURRDIR)omain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve omain ; fi'
@rm -f nmclash.o a.out @rm -f nmclash.o a.out
mv *.o PEEPHOLE mv *.o PEEPHOLE
CEmain: Cfiles CEmain: Cfiles
rm -f *.o rm -f *.o
sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) "COPTIONS="-DCODE_EXPANDER $(CURRDIR)/cemain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve cemain ; fi' sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) "COPTIONS="-DCODE_EXPANDER $(CURRDIR)cemain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve cemain ; fi'
@rm -f nmclash.o a.out @rm -f nmclash.o a.out
mv *.o CODE_EXPANDER mv *.o CODE_EXPANDER
install: all install: all
cp $(CURRDIR)/main $(EMHOME)/lib/em_m2 cp $(CURRDIR)main $(EMHOME)/lib/em_m2
rm -f $(EMHOME)/man/em_m2.6 $(EMHOME)/man/modula-2.1 rm -f $(EMHOME)/man/em_m2.6 $(EMHOME)/man/modula-2.1
cp $(CURRDIR)/em_m2.6 $(CURRDIR)/modula-2.1 $(EMHOME)/man cp $(CURRDIR)em_m2.6 $(CURRDIR)modula-2.1 $(EMHOME)/man
cmp: all cmp: all
-cmp $(CURRDIR)/main $(EMHOME)/lib/em_m2 -cmp $(CURRDIR)main $(EMHOME)/lib/em_m2
-cmp $(CURRDIR)/em_m2.6 $(EMHOME)/man/em_m2.6 -cmp $(CURRDIR)em_m2.6 $(EMHOME)/man/em_m2.6
-cmp $(CURRDIR)/modula-2.1 $(EMHOME)/man/modula-2.1 -cmp $(CURRDIR)modula-2.1 $(EMHOME)/man/modula-2.1
opr: opr:
make pr | opr make pr | opr
@ -90,7 +90,7 @@ pr:
clean: clean:
rm -f $(OBJ) $(GENFILES) LLfiles hfiles Cfiles clashes \ rm -f $(OBJ) $(GENFILES) LLfiles hfiles Cfiles clashes \
$(CURRDIR)/main LL.output $(CURRDIR)main LL.output
(cd .. ; rm -rf Xsrc) (cd .. ; rm -rf Xsrc)
lint: Cfiles lint: Cfiles
@ -162,17 +162,17 @@ Xlint:
$(LIBDIR)/llib-lstring.ln \ $(LIBDIR)/llib-lstring.ln \
$(LIBDIR)/llib-lsystem.ln $(LIBDIR)/llib-lsystem.ln
$(CURRDIR)/main: $(OBJ) $(CURRDIR)/Makefile $(CURRDIR)main: $(OBJ) $(CURRDIR)Makefile
$(CC) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)/main $(CC) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)main
-size $(CURRDIR)/main -size $(CURRDIR)main
$(CURRDIR)/omain: $(OBJ) $(CURRDIR)/Makefile $(CURRDIR)omain: $(OBJ) $(CURRDIR)Makefile
$(CC) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)/omain $(CC) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)omain
size $(CURRDIR)/omain size $(CURRDIR)omain
$(CURRDIR)/cemain: $(OBJ) $(CURRDIR)/Makefile $(CURRDIR)cemain: $(OBJ) $(CURRDIR)Makefile
$(CC) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)/cemain $(CC) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)cemain
size $(CURRDIR)/cemain size $(CURRDIR)cemain
#AUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTO #AUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTO

2
lang/m2/comp/Resolve
View file

@ -54,4 +54,4 @@ $i: clashes $PW/$i
\$(CID) -Fclashes < $PW/$i > $i \$(CID) -Fclashes < $PW/$i > $i
EOF EOF
done done
make EMHOME=$EMHOME CURRDIR=$currdir COPTIONS=$options $target make EMHOME=$EMHOME CURRDIR=$currdir/ COPTIONS=$options $target