--- Makefile.in.orig	Fri Aug  4 13:51:41 2000
+++ Makefile.in	Fri Aug  4 13:53:45 2000
@@ -20,8 +20,14 @@
 
 all: gpasm
 
-DATADIR = @prefix@/gpasm
-CFLAGS = @CFLAGS@ -D DATADIR=\"$(DATADIR)\"	# -g --pedantic -Wall
+prefix = @prefix@
+CFLAGS = @CFLAGS@ -DDATADIR=\"$(DATADIR)\"    # -g --pendantic -Wall
+LIBS = @LIBS@
+YACC = @YACC@
+LEX = @LEX@
+INSTALL = @INSTALL@
+
+DATADIR = $(prefix)/gpasm
 SHELL = /bin/sh
 
 # All the objects, in alphabetical order
@@ -39,23 +46,23 @@
 	util.o 
 
 gpasm: $(OBJECTS)
-	$(CC) -o gpasm $(OBJECTS) @LIBS@
+	$(CC) -o gpasm $(OBJECTS) $(LIBS)
 
 gpasm.tab.c gpasm.tab.h: gpasm.y
-	@YACC@ -d gpasm.y
+	$(YACC) -d gpasm.y
 	mv y.tab.c gpasm.tab.c
 	mv y.tab.h gpasm.tab.h
 
 scan.c: scan.l gpasm.tab.h
-	@LEX@ scan.l
+	$(LEX) scan.l
 	mv lex.yy.c scan.c
 
 ########################################################################
 
 install:
-	@INSTALL@ -m 755 gpasm @prefix@/bin
+	$(INSTALL) -m 755 gpasm $(prefix)/bin
 	mkdir -m 755 -p $(DATADIR)
-	@INSTALL@ -m 644 special.inc $(DATADIR)/special.inc
+	$(INSTALL) -m 644 special.inc $(DATADIR)/special.inc
 
 ########################################################################