Introduced EMHOME.

diff --git a/util/ack/Makefile b/util/ack/Makefile
index aa92727..18c91a4 100644 (file)
--- a/util/ack/Makefile
+++ b/util/ack/Makefile
@@ -1,18 +1,20 @@
 # $Header$
+EMHOME=../..
 HFILES=ack.h list.h trans.h data.h dmach.h grows.h
 DSRC=list.c data.c main.c scan.c svars.c trans.c util.c rmach.c run.c grows.c\
      files.c
 ISRC=dmach.c intable.c
 OBJ=list.o data.o main.o scan.o svars.o trans.o util.o rmach.o run.o \
     dmach.o intable.o grows.o files.o
-ACKDIR=../../lib/ack
+ACKDIR=$(EMHOME)/lib/ack
 FE=fe
 INTABLES=pdp int
 LNTABLES=acc apc abc vax2 vax4 i86 ix m68k2 m68k4 pmds pmds4 z8000\
 int22 int24 int44 6500 6800 6805 6809 i80 ns s2650 z80 
-CFLAGS=-O -n
-BINDIR=../../bin
-MODDIR=../../modules/lib
+INCLUDES=-I $(EMHOME)/h
+CFLAGS=-O -n $(INCLUDES)
+BINDIR=$(EMHOME)/bin
+MODDIR=$(EMHOME)/modules/lib
 
 head:   ack
 
@@ -32,7 +34,7 @@ clean:
                (cd pc ; make clean )
 
 ack:    $(OBJ)
-       $(CC) -o ack $(CFLAGS) $(OBJ) $(MODDIR)/libstr.a
+       $(CC) -o ack $(CFLAGS) $(OBJ) $(MODDIR)/libstring.a
 
 grows.o files.o list.o run.o \
 data.o main.o scan.o trans.o rmach.o util.o : ack.h list.h
@@ -43,9 +45,9 @@ files.o rmach.o trans.o grows.c : grows.h
 
 rmach.c: dmach.h
 
-files.o main.o rmach.o : ../../h/em_path.h
+files.o main.o rmach.o : $(EMHOME)/h/em_path.h
 
-main.o : ../../h/local.h
+main.o : $(EMHOME)/h/local.h
 
 malloc.o svars.o:      ack.h
 

diff --git a/util/ack/pc/Makefile b/util/ack/pc/Makefile
index 3d55256..6818105 100644 (file)
--- a/util/ack/pc/Makefile
+++ b/util/ack/pc/Makefile
@@ -1,7 +1,7 @@
-d=../../..
-h=$d/h
+EMHOME=../../..
+h=$(EMHOME)/h
 
-PC_PATH=$d/lib/em_pc
+PC_PATH=$(EMHOME)/lib/em_pc
 
 em_pc:          em_pc.c $h/local.h $h/em_path.h
                cc -n -o em_pc -O -I$h em_pc.c