Index: src/all-arch.mak
===================================================================
--- src/all-arch.mak	(revision 184)
+++ src/all-arch.mak	(working copy)
@@ -298,24 +298,24 @@
 # Remove the old gs binary first, so as to preserve the previous
 # gs-x.yy version, if any.
 install-binary:
-	-$(RM) $(BINDIR)/$(GS)
+	-$(RM) $(install_prefix)$(BINDIR)/$(GS)
 	@$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) ; \
 	d=`pwd` ; \
 	d=`basename $$d` ; \
 	d=`echo $$d | sed -e s/gs/gs-/` ; \
-	$(RM) $(BINDIR)/$$d ; \
-	ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
-	ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
+	$(RM) $(install_prefix)$(BINDIR)/$$d ; \
+	ln $(install_prefix)$(BINDIR)/$(GS) $(install_prefix)$(BINDIR)/$$d ; \
+	ls -l $(install_prefix)$(BINDIR)/$(GS) $(install_prefix)$(BINDIR)/$$d
 
 install-binary-gnu-readline:
-	-$(RM) $(BINDIR)/$(GS)
+	-$(RM) $(install_prefix)$(BINDIR)/$(GS)
 	@$(MAKE) $(ARGS) install GS=$(GS)  XLIBDIRS=$(XLIBDIRSALL) $(GNU_READLINE_ARGS) ; \
 	d=`pwd` ; \
 	d=`basename $$d` ; \
 	d=`echo $$d | sed -e s/gs/gs-/` ; \
-	$(RM) $(BINDIR)/$$d ; \
-	ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
-	ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
+	$(RM) $(install_prefix)$(BINDIR)/$$d ; \
+	ln $(install_prefix)$(BINDIR)/$(GS) $(install_prefix)$(BINDIR)/$$d ; \
+	ls -l $(install_prefix)$(BINDIR)/$(GS) $(install_prefix)$(BINDIR)/$$d
 
 install-fontmap:
 	@d=`pwd` ; \
@@ -323,14 +323,14 @@
 	d=`echo $$d | sed -e s/gs//` ; \
 	if test -f $(GS_SRC_DIR)/Fontmap.new ; \
 	then \
-		if test -f $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
+		if test -f $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
 		then \
 			true ; \
 		else \
-			mv $(GS_SHARE_DIR)/$$d/lib/Fontmap $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
+			mv $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/Fontmap $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
 		fi ; \
-		$(CP) $(GS_SRC_DIR)/Fontmap.new $(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
-		ls -l $(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
+		$(CP) $(GS_SRC_DIR)/Fontmap.new $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
+		ls -l $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
 	fi
 
 install-pdfsec:
@@ -339,9 +339,9 @@
 	d=`echo $$d | sed -e s/gs//` ; \
 	if test -f $(GS_SRC_DIR)/lib/pdf_sec.ps ; \
 	then \
-		$(MV) $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
-		$(CP) lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
-		$(CHMOD) 664 $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
+		$(MV) $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
+		$(CP) lib/pdf_sec.ps $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
+		$(CHMOD) 664 $(install_prefix)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
 	fi
 
 #=======================================================================
Index: src/macos-fw.mak
===================================================================
--- src/macos-fw.mak	(revision 184)
+++ src/macos-fw.mak	(working copy)
@@ -103,19 +103,19 @@
 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
 
 install-so: so
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(gsdir)
-	-mkdir $(gsdatadir)
-	-mkdir $(bindir)
-	-mkdir $(libdir)
-	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
-	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
-	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
-	$(RM_) $(libdir)/$(GS_SONAME)
-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
-	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
+	-mkdir $(install_prefix)$(prefix)
+	-mkdir $(install_prefix)$(datadir)
+	-mkdir $(install_prefix)$(gsdir)
+	-mkdir $(install_prefix)$(gsdatadir)
+	-mkdir $(install_prefix)$(bindir)
+	-mkdir $(install_prefix)$(libdir)
+	$(INSTALL_PROGRAM) $(GSSOC) $(install_prefix)$(bindir)/$(GSSOC_XENAME)
+	$(INSTALL_PROGRAM) $(GSSOX) $(install_prefix)$(bindir)/$(GSSOX_XENAME)
+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(install_prefix)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+	$(RM_) $(install_prefix)$(libdir)/$(GS_SONAME)
+	ln -s $(GS_SONAME_MAJOR_MINOR) $(install_prefix)$(libdir)/$(GS_SONAME)
+	$(RM_) $(install_prefix)$(libdir)/$(GS_SONAME_MAJOR)
+	ln -s $(GS_SONAME_MAJOR_MINOR) $(install_prefix)$(libdir)/$(GS_SONAME_MAJOR)
 
 soinstall: install-so install-scripts install-data
 
@@ -144,8 +144,8 @@
 	cp -r doc $(GS_FRAMEWORK)/Versions/Current
 
 framework_install : framework
-	rm -rf $(prefix)
-	cp -r $(GS_FRAMEWORK) $(prefix)
+	rm -rf $(install_prefix)$(prefix)
+	cp -r $(GS_FRAMEWORK) $(install_prefix)$(prefix)
 
 # Make the build directories
 SODIRS: STDDIRS
Index: src/unixinst.mak
===================================================================
--- src/unixinst.mak	(revision 184)
+++ src/unixinst.mak	(working copy)
@@ -28,24 +28,24 @@
 # rules, just in case bindir or scriptdir is a subdirectory of any of these.
 
 install-exec: STDDIRS $(GS_XE)
-	-mkdir -p $(datadir)
+	-mkdir -p $(install_prefix)$(datadir)
 	-mkdir -p $(install_prefix)$(gsdir)
 	-mkdir -p $(install_prefix)$(gsdatadir)
-	-mkdir -p $(bindir)
-	$(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
+	-mkdir -p $(install_prefix)$(bindir)
+	$(INSTALL_PROGRAM) $(GS_XE) $(install_prefix)$(bindir)/$(GS)
 
 install-scripts: $(PSLIBDIR)/gsnd
-	-mkdir -p $(datadir)
+	-mkdir -p $(install_prefix)$(datadir)
 	-mkdir -p $(install_prefix)$(gsdir)
 	-mkdir -p $(install_prefix)$(gsdatadir)
-	-mkdir -p $(scriptdir)
+	-mkdir -p $(install_prefix)$(scriptdir)
 	$(SH) -c 'for f in \
 gsbj gsdj gsdj500 gslj gslp gsnd \
 bdftops dumphint dvipdf eps2eps font2c \
 pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
 ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
 fixmswrd.pl lprsetup.sh pv.sh unix-lpr.sh ;\
-	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
+	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(install_prefix)$(scriptdir); fi;\
 	done'
 
 PSRESDIR=$(PSLIBDIR)/../Resource
@@ -59,7 +59,7 @@
 # one file from each subdirectory just as a sanity check.
 
 install-libdata: 
-	-mkdir -p $(datadir)
+	-mkdir -p $(install_prefix)$(datadir)
 	-mkdir -p $(install_prefix)$(gsdir)
 	-mkdir -p $(install_prefix)$(gsdatadir)
 	-mkdir -p $(install_prefix)$(gsdatadir)/lib
@@ -97,7 +97,7 @@
 # copy in every category (directory) but CVS
 RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS` 
 install-resdata: $(PSRESDIR)/Decoding/Unicode
-	-mkdir -p $(datadir)
+	-mkdir -p $(install_prefix)$(datadir)
 	-mkdir -p $(install_prefix)$(gsdir)
 	-mkdir -p $(install_prefix)$(gsdatadir)/Resource
 	$(SH) -c 'for dir in $(RES_CATEGORIES); do \
@@ -133,9 +133,9 @@
 MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
 MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
 install-man: $(PSMANDIR)/gs.1
-	$(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
+	$(SH) -c 'test -d $(install_prefix)$(mandir) || mkdir -p $(install_prefix)$(mandir)'
 	$(SH) -c 'for d in $(MAN_LCDIRS) ;\
-	do man1dir=$(mandir)/$$d/man$(man1ext) ;\
+	do man1dir=$(install_prefix)$(mandir)/$$d/man$(man1ext) ;\
 	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
 	  for f in $(PSMANDIR)/$$d/*.1 ;\
 	    do $(INSTALL_DATA) $$f $$man1dir ;\
@@ -172,8 +172,8 @@
 
 install-shared: $(GS_SHARED_OBJS)
 	if test "x$(GS_SHARED_OBJS)" != x; then \
-		mkdir -p $(gssharedir); \
+		mkdir -p $(install_prefix)$(gssharedir); \
 		for obj in $(GS_SHARED_OBJS); do \
-			$(INSTALL_PROGRAM) $$obj $(gssharedir)/; \
+			$(INSTALL_PROGRAM) $$obj $(install_prefix)$(gssharedir)/; \
 		done; \
 	fi
Index: src/unix-dll.mak
===================================================================
--- src/unix-dll.mak	(revision 184)
+++ src/unix-dll.mak	(working copy)
@@ -96,19 +96,19 @@
 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
 
 install-so: so
-	-mkdir -p $(prefix)
-	-mkdir -p $(datadir)
-	-mkdir -p $(gsdir)
-	-mkdir -p $(gsdatadir)
-	-mkdir -p $(bindir)
-	-mkdir -p $(libdir)
-	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
-	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
-	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
-	$(RM_) $(libdir)/$(GS_SONAME)
-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
-	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
+	-mkdir -p $(install_prefix)$(prefix)
+	-mkdir -p $(install_prefix)$(datadir)
+	-mkdir -p $(install_prefix)$(gsdir)
+	-mkdir -p $(install_prefix)$(gsdatadir)
+	-mkdir -p $(install_prefix)$(bindir)
+	-mkdir -p $(install_prefix)$(libdir)
+	$(INSTALL_PROGRAM) $(GSSOC) $(install_prefix)$(bindir)/$(GSSOC_XENAME)
+	$(INSTALL_PROGRAM) $(GSSOX) $(install_prefix)$(bindir)/$(GSSOX_XENAME)
+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(install_prefix)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+	$(RM_) $(install_prefix)$(libdir)/$(GS_SONAME)
+	ln -s $(GS_SONAME_MAJOR_MINOR) $(install_prefix)$(libdir)/$(GS_SONAME)
+	$(RM_) $(install_prefix)$(libdir)/$(GS_SONAME_MAJOR)
+	ln -s $(GS_SONAME_MAJOR_MINOR) $(install_prefix)$(libdir)/$(GS_SONAME_MAJOR)
 
 soinstall: install-so install-scripts install-data