diff --git a/Makefile b/Makefile
index f0b50d48..9f288127 100644
--- a/Makefile
+++ b/Makefile
@@ -77,12 +77,14 @@ install-real: install-dirs
 		(cd $$dir && ${MAKE} install); done
 
 install-tcl-dirs:
-	${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} $(DESTDIR)${INSTALL_MANDIR} \
-		$(DESTDIR)${SYSDIR} $(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/bitmaps
+	${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
+	$(DESTDIR)${INSTALL_MANDIR} $(DESTDIR)${INSTALL_SYSDIR} \
+	$(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/bitmaps
 
 install-dirs:
-	${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} $(DESTDIR)${INSTALL_MANDIR} \
-		$(DESTDIR)${INSTALL_SYSDIR} $(DESTDIR)${INSTALL_SCMDIR}
+	${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
+	$(DESTDIR)${INSTALL_MANDIR} $(DESTDIR)${INSTALL_SYSDIR} \
+	$(DESTDIR)${INSTALL_SCMDIR}
 
 install-tcl:
 	@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
diff --git a/doc/html/Makefile b/doc/html/Makefile
index 427ae37c..bf577bcc 100644
--- a/doc/html/Makefile
+++ b/doc/html/Makefile
@@ -2,7 +2,7 @@ MAGICDIR = ../..
 
 include $(MAGICDIR)/defs.mak
 
-HTML_INSTDIR=$(LIBDIR)/magic/doc/html
+HTML_INSTDIR=$(INSTALL_LIBDIR)/magic/doc/html
 
 install: $(DESTDIR)${HTML_INSTDIR}
 	tar cf - . | (cd $(DESTDIR)${HTML_INSTDIR}; tar xf - )
diff --git a/doc/latexfiles/Makefile b/doc/latexfiles/Makefile
index 5b0ba47a..aeba340d 100644
--- a/doc/latexfiles/Makefile
+++ b/doc/latexfiles/Makefile
@@ -3,7 +3,7 @@ MAGICDIR = ../..
 include $(MAGICDIR)/defs.mak
 
 PS_SRCDIR=../psfiles
-PS_INSTDIR=$(LIBDIR)/magic/doc
+PS_INSTDIR=$(INSTALL_LIBDIR)/magic/doc
 
 .SUFFIXES: .dvi .tex .ps
 
diff --git a/doc/man/Makefile b/doc/man/Makefile
index ebf937ba..da493492 100644
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -15,36 +15,36 @@ EQN=eqn -Ppsc
 include ${MAGICDIR}/defs.mak
 
 MANFILES = \
-    $(DESTDIR)${MANDIR}/man1/ext2spice.1 \
-    $(DESTDIR)${MANDIR}/man1/extcheck.1 \
-    $(DESTDIR)${MANDIR}/man1/ext2sim.1 \
-    $(DESTDIR)${MANDIR}/man1/magic.1 \
-    $(DESTDIR)${MANDIR}/man5/cmap.5 \
-    $(DESTDIR)${MANDIR}/man5/displays.5 \
-    $(DESTDIR)${MANDIR}/man5/dlys.5 \
-    $(DESTDIR)${MANDIR}/man5/dstyle.5 \
-    $(DESTDIR)${MANDIR}/man5/ext.5 \
-    $(DESTDIR)${MANDIR}/man5/glyphs.5 \
-    $(DESTDIR)${MANDIR}/man5/mag.5 \
-    $(DESTDIR)${MANDIR}/man5/net.5 \
-    $(DESTDIR)${MANDIR}/man5/sim.5
+    $(DESTDIR)${INSTALL_MANDIR}/man1/ext2spice.1 \
+    $(DESTDIR)${INSTALL_MANDIR}/man1/extcheck.1 \
+    $(DESTDIR)${INSTALL_MANDIR}/man1/ext2sim.1 \
+    $(DESTDIR)${INSTALL_MANDIR}/man1/magic.1 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/cmap.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/displays.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/dlys.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/dstyle.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/ext.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/glyphs.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/mag.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/net.5 \
+    $(DESTDIR)${INSTALL_MANDIR}/man5/sim.5
 
 install: ${MANFILES}
 
-$(DESTDIR)${MANDIR}:
-	${SCRIPTS}/mkdirs $(DESTDIR)${MANDIR}
+$(DESTDIR)${INSTALL_MANDIR}:
+	${SCRIPTS}/mkdirs $(DESTDIR)${INSTALL_MANDIR}
 
-$(DESTDIR)${MANDIR}/man1: $(DESTDIR)${MANDIR}
-	${SCRIPTS}/mkdirs $(DESTDIR)${MANDIR}/man1
+$(DESTDIR)${INSTALL_MANDIR}/man1: $(DESTDIR)${INSTALL_MANDIR}
+	${SCRIPTS}/mkdirs $(DESTDIR)${INSTALL_MANDIR}/man1
 
-$(DESTDIR)${MANDIR}/man1/%: % $(DESTDIR)${MANDIR}/man1
-	${CP} $* $(DESTDIR)${MANDIR}/man1/$*
+$(DESTDIR)${INSTALL_MANDIR}/man1/%: % $(DESTDIR)${INSTALL_MANDIR}/man1
+	${CP} $* $(DESTDIR)${INSTALL_MANDIR}/man1/$*
 
-$(DESTDIR)${MANDIR}/man5: $(DESTDIR)${MANDIR}
-	${SCRIPTS}/mkdirs $(DESTDIR)${MANDIR}/man5
+$(DESTDIR)${INSTALL_MANDIR}/man5: $(DESTDIR)${INSTALL_MANDIR}
+	${SCRIPTS}/mkdirs $(DESTDIR)${INSTALL_MANDIR}/man5
 
-$(DESTDIR)${MANDIR}/man5/%: % $(DESTDIR)${MANDIR}/man5
-	${CP} $* $(DESTDIR)${MANDIR}/man5/$*
+$(DESTDIR)${INSTALL_MANDIR}/man5/%: % $(DESTDIR)${INSTALL_MANDIR}/man5
+	${CP} $* $(DESTDIR)${INSTALL_MANDIR}/man5/$*
 
 mans:
 	${SCRIPTS}/printmans "${TROFF} ${MANMACS} -" *.1 *.5
diff --git a/doc/tutcells/Makefile b/doc/tutcells/Makefile
index 7edc8cb5..a60d909b 100644
--- a/doc/tutcells/Makefile
+++ b/doc/tutcells/Makefile
@@ -6,7 +6,7 @@ MAGICDIR = ../..
 
 include ${MAGICDIR}/defs.mak
 
-TUTDIR = ${LIBDIR}/magic/tutorial
+TUTDIR = ${INSTALL_LIBDIR}/magic/tutorial
 
 TUTFILES= m3a.mag maint2a.mag tut1.mag \
     tut2a.mag tut2b.mag tut2c.mag tut2d.mag \
diff --git a/scmos/cif_template/Makefile b/scmos/cif_template/Makefile
index 0c654441..89377a82 100644
--- a/scmos/cif_template/Makefile
+++ b/scmos/cif_template/Makefile
@@ -21,8 +21,7 @@ all: $(OBJS_DIR) $(CIFIN) $(CIFOUT) $(IBMCIFIN) $(IBMCIFOUT) $(TMCIFIN) \
 	$(TMCIFOUT) $(SUBCIFIN) $(SUBCIFOUT)
 
 clean:;
-	rm -f $(CIFIN) $(CIFOUT) $(IBMCIFIN) $(IBMCIFOUT) $(TMCIFIN) \
-	$(TMCIFOUT) $(SUBCIFIN) $(SUBCIFOUT)
+	rm -rf $(OBJS_DIR)
 
 scg: cifout.c cifout-cmos26b.gen cifout.gen cifout.nw\
 	   cifout.others cifout.pw cifout.scgnw cifout.scgpw
diff --git a/scripts/configure b/scripts/configure
index 1774a4ce..2114738f 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -640,7 +640,7 @@ gr_dflags
 gr_cflags
 rl_libs
 rl_defs
-dist_prefix
+DIST_DIR
 cadinstall
 programs
 unused
@@ -6143,15 +6143,15 @@ fi
 # place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
 # the prefix is replaced by the destination directory, rather than appended
 # to it.
-dist_prefix="\${exec_prefix}"
+DIST_DIR="\${exec_prefix}"
 
 # Check whether --with-distdir was given.
 if test "${with_distdir+set}" = set; then :
   withval=$with_distdir;
   if test "$withval" = "no" -o "$withval" = "NO" ; then
-     dist_prefix="\${exec_prefix}"
+     DIST_DIR="\${exec_prefix}"
   else
-     dist_prefix=$arg
+     DIST_DIR=${withval}
   fi
 
 fi