Removed all those ../../.. references

diff --git a/modules/src/em_code/Makefile b/modules/src/em_code/Makefile
index d8a58d7..4aeca13 100644 (file)
--- a/modules/src/em_code/Makefile
+++ b/modules/src/em_code/Makefile
@@ -18,18 +18,18 @@ em_code.3:  em_code.3X
                tbl < em_code.3X > em_code.3
 
 libeme.a:      make.sh e/em_private.h e/em.c
-               sh make.sh e
+               EMHOME=$(EMHOME); export EMHOME; sh make.sh e
                -sh -c 'ranlib libeme.a'
 
 libemk.a:      make.sh k/em_private.h k/em.c
-               sh make.sh k
+               EMHOME=$(EMHOME); export EMHOME; sh make.sh k
                -sh -c 'ranlib libemk.a'
 
 make.sh:       em.gen em.nogen
                make.fun em.gen em.nogen | sh
 
 em.gen:                make.em.gen $(EMHOME)/etc/em_table
-               make.em.gen > em.gen
+               make.em.gen $(EMHOME)/etc/em_table > em.gen
 
 pr:
                @pr Makefile make.em.gen make.fun em.nogen e/em_private.h e/em.c k/em_private.h k/em.c

diff --git a/modules/src/em_code/make.em.gen b/modules/src/em_code/make.em.gen
index e46e16d..f9cae1b 100755 (executable)
--- a/modules/src/em_code/make.em.gen
+++ b/modules/src/em_code/make.em.gen
@@ -1,5 +1,5 @@
-echo '% this part is generated from ../../../etc/em_table at: ' `date`
-ed - ../../../etc/em_table <<'EOI' 
+echo "% this part is generated from $1 at: " `date`
+ed - $1 <<'EOI' 
 1,/^$/d
 1,/^$/d
 1,$s/^\(...\)  \(.\).*/\1:\2/

diff --git a/modules/src/em_code/make.fun b/modules/src/em_code/make.fun
index 1a69660..15363c5 100755 (executable)
--- a/modules/src/em_code/make.fun
+++ b/modules/src/em_code/make.fun
@@ -33,14 +33,14 @@ g/^BODY/s/^BODY \(.*\)$/{\
 --EOF--/
 1,/^END/-1p
 1,/^END/d
-g:^NAME:s:^NAME \(.*\)$:cc -c -O -I$1 -I../../h -I../../../h \1.c:
+g:^NAME:s:^NAME \(.*\)$:cc -c -O -I$1 -I$EMHOME/modules/h -I$EMHOME/h \1.c:
 1i
 cat >make.sh <<'--EOF--'
 : script for making lib
 rm -f *.o
 .
 $a
-cc -c -O -I$1 -I../../h -I../../../h $1/em.c
+cc -c -O -I$1 -I$EMHOME/modules/h -I$EMHOME/h $1/em.c
 mv em.o em$1.o
 rm -f libem$1.a
 ar rc libem$1.a *.o