Adapted to make use of ../../compare and ../../install.

diff --git a/mach/vax4/libcc/Makefile b/mach/vax4/libcc/Makefile
index 39c4261..94d8c0d 100644 (file)
--- a/mach/vax4/libcc/Makefile
+++ b/mach/vax4/libcc/Makefile
@@ -3,7 +3,6 @@ MACHDEF="MACH=vax4" "SUF=o" "ASAR=ar"
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 MON="PREF=mon" "SRC=lang/cem/libcc/mon"
-LIBDIR=../lib
 
 install:       cpstdio cpgen cpmon
 
@@ -18,15 +17,15 @@ cmp:                cmpstdio cmpgen cmpmon
 
 cmpstdio:
                make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail
-               -cmp tail_cc.1s $(LIBDIR)/tail_cc.1s
+               -../../compare tail_cc.1s
 cmpgen:
                make -f $(MAKEFILE) $(GEN) $(MACHDEF) head
-               -cmp head_cc $(LIBDIR)/head_cc
+               -../../compare head_cc
                make -f $(MAKEFILE) $(GEN) $(MACHDEF) tail
-               -cmp tail_cc.2g $(LIBDIR)/tail_cc.2g
+               -../../compare tail_cc.2g
 cmpmon:
                make -f $(MAKEFILE) $(MON) $(MACHDEF) tail
-               -cmp tail_mon $(LIBDIR)/tail_mon
+               -../../compare tail_mon
 
 clean:
                -rm -f *.old *.[ce$(SUF)] tail* head*

diff --git a/mach/vax4/libem/Makefile b/mach/vax4/libem/Makefile
index f2f9843..920bd5f 100644 (file)
--- a/mach/vax4/libem/Makefile
+++ b/mach/vax4/libem/Makefile
@@ -1,14 +1,13 @@
 TAILSRC=tail_em.a
-l=../lib
 
 install:       head_em tail_em
-               cp head_em $l/head_em
-               cp tail_em $l/tail_em
+               ../../install head_em
+               ../../install tail_em
                -rm -f head_em tail_em
 
 cmp:           head_em tail_em
-               -cmp head_em $l/head_em
-               -cmp tail_em $l/tail_em
+               -../../compare head_em
+               -../../compare tail_em
 
 head_em:        head_em.s system.h
                vax4 -c -I../../../h head_em.s

diff --git a/mach/vax4/libpc/Makefile b/mach/vax4/libpc/Makefile
index d2767f0..87bf4fb 100644 (file)
--- a/mach/vax4/libpc/Makefile
+++ b/mach/vax4/libpc/Makefile
@@ -1,15 +1,14 @@
 MAKEFILE=../../proto/libg/Makefile
 MACHDEF="MACH=vax4" "SUF=o" "ASAR=ar"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
-LIBDIR=../lib
 
 install:
        make -f $(MAKEFILE) $(PCDEF) $(MACHDEF) cp
 
 cmp:
        make -f $(MAKEFILE) $(PCDEF) $(MACHDEF) all
-       cmp head_pc $(LIBDIR)/head_pc
-       cmp tail_pc $(LIBDIR)/tail_pc
+       -../../compare head_pc
+       -../../compare tail_pc
 
 clean:
                -rm -f *.old *.[ce$(SUF)] tail* head*