--- gforth/Makefile.in	2012/03/19 21:51:38	1.470
+++ gforth/Makefile.in	2012/03/19 22:36:01	1.472
@@ -51,24 +51,24 @@ EC = @EC@
 
 package =
 VPATH = @srcdir@
-prefix = $(package)@prefix@
+prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
-bindir = @bindir@
+bindir = $(package)@bindir@
 #read-only architecture-independent files
-datarootdir = @datarootdir@
-datadir = @datadir@
+datarootdir = $(package)@datarootdir@
+datadir = $(package)@datadir@
 #read-only architecture-dependent non-ascii files
-libdir = @libdir@
+libdir = $(package)@libdir@
 libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/)
-includedir = @includedir@
-infodir = @infodir@
-htmldir = @htmldir@
-mandir = @mandir@
+includedir = $(package)@includedir@
+infodir = $(package)@infodir@
+htmldir = $(package)@htmldir@
+mandir = $(package)@mandir@
 man1dir= $(mandir)/man1
 man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/
-emacssitelispdir=@lispdir@
+emacssitelispdir=$(package)@lispdir@
 siteforthdir=$(datadir)/gforth/site-forth
 
 # -------------	Utility programs
@@ -916,7 +916,7 @@ tags:		gforth.tags
 		$(CP) gforth.tags $@
 
 install.TAGS:	TAGS install-tags.fs
-		sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
+		sed 's;^\$(srcdir)/;;' TAGS|$(PREFORTH) -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
 
 gforth.TAGS:	@kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
 		$(FORTHK) etags.fs except.fs startup.fs -e bye