diff --git a/mach/proto/libg/Makefile b/mach/proto/libg/Makefile
index b0d928cae..1ad976e83 100644
--- a/mach/proto/libg/Makefile
+++ b/mach/proto/libg/Makefile
@@ -1,13 +1,12 @@
 # $Header$
 
 MACH=MACHINE
-MACHFL=-c -O -L
+MACHFL=-c.$(SUF) -O -L
 SUB =
 PREF=pc
 ASAR=arch
 SRC=lang/pc/libpc
 HOME = ../../..
-TAILSRC=$(HOME)/$(SRC)/tail_$(PREF)$(SUB).a
 HEADSRC=$(HOME)/$(SRC)/head_$(PREF).e
 
 all:    head tail
@@ -17,14 +16,11 @@ head:   head_$(PREF) $(HOME)/h/*.h
 tail:   tail_$(PREF)$(SUB) $(HOME)/h/*.h
 
 headcp: head
-	cp head_$(PREF) ../lib/head_$(PREF)
+	../../install head_$(PREF)
 	rm -f head_$(PREF)
 
 tailcp: tail
-	cp tail_$(PREF)$(SUB) ../lib/tail_$(PREF)$(SUB)
-	-case $(ASAR) in \
-	ar)	ranlib ../lib/tail_$(PREF)$(SUB) ;; \
-	esac
+	../../install tail_$(PREF)$(SUB)
 	rm -f tail_$(PREF)$(SUB)
 
 cp:     headcp tailcp
@@ -35,23 +31,11 @@ head_$(PREF):  $(HEADSRC)
 	mv head_$(PREF).$(SUF) head_$(PREF)
 	-rm -f head_$(PREF).[ekm$(SUF)]
 
-tail_$(PREF)$(SUB): $(TAILSRC)
+tail_$(PREF)$(SUB):
 	@echo translation test
 	@$(MACH) $(MACHFL) $(HOME)/mach/proto/libg/barrier.c
 	@-rm barrier.[oeskm]
 	@echo OK
 	-rm -f tail_$(PREF)$(SUB)
-	arch x $(TAILSRC)
-	-LIST= ;\
-	for i in `arch t $(TAILSRC)`;\
-	do if $(MACH) -I$(HOME)/h $(MACHFL) -LIB $$i ; then \
-		case $$i in \
-		*.c)    LIST="$$LIST `basename $$i .c`.$(SUF)" ;;\
-		*.e)    LIST="$$LIST `basename $$i .e`.$(SUF)" ;;\
-		*.p)    LIST="$$LIST `basename $$i .p`.$(SUF)" ;;\
-	esac \
-	else rm -f `basename $$i .c`.[k$(SUF)m] ;\
-	fi ;\
-	rm -f $$i ;\
-	done ;\
-	$(ASAR) r tail_$(PREF)$(SUB) $$LIST ; rm -f $$LIST
+	MACH="$(MACH)" MACHFL="$(MACHFL)" ASAR=$(ASAR) \
+		march $(HOME)/$(SRC) tail_$(PREF)$(SUB)