Correction to the configuration for distributed install.

scripts/configure.in

@@ -349,13 +349,13 @@ 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}"
 AC_ARG_WITH(distdir,
 [  --with-distdir=DIR	    install into location DIR for distribution], [
   if test "$withval" = "no" -o "$withval" = "NO" ; then
-     dist_prefix="\${exec_prefix}"
+     DIST_DIR="\${exec_prefix}"
   else
-     dist_prefix=$arg
+     DIST_DIR=${withval}
   fi
 ], )
 
@@ -1782,7 +1782,7 @@ AC_SUBST(modules)
 AC_SUBST(unused)
 AC_SUBST(programs)
 AC_SUBST(cadinstall)
-AC_SUBST(dist_prefix)
+AC_SUBST(DIST_DIR)
 
 AC_SUBST(rl_defs)
 AC_SUBST(rl_libs)

scripts/defs.mak.in

@@ -34,9 +34,9 @@ SCMDIR                 = ${libdir}/magic/scm
 TCLDIR                 = ${libdir}/magic/tcl
 
 # Install targets may be different if dist_prefix is set by configure
-INSTALL_BINDIR         = @dist_prefix@/bin
-INSTALL_MANDIR         = @dist_prefix@/share/man
-INSTALL_LIBDIR         = @dist_prefix@/lib
+INSTALL_BINDIR         = @DIST_DIR@/bin
+INSTALL_MANDIR         = @DIST_DIR@/share/man
+INSTALL_LIBDIR         = @DIST_DIR@/lib
 INSTALL_SYSDIR         = ${INSTALL_LIBDIR}/magic/sys
 INSTALL_SCMDIR         = ${INSTALL_LIBDIR}/magic/scm
 INSTALL_TCLDIR         = ${INSTALL_LIBDIR}/magic/tcl

tcltk/ext2sim.sh

@@ -15,7 +15,7 @@ for i in $@; do
    esac
 done
 #
-eval /usr/local/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
+eval /home/tim/cad/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
 drc off
 box 0 0 0 0
 ext2sim $esargs

tcltk/ext2spice.sh

@@ -15,7 +15,7 @@ for i in $@; do
    esac
 done
 #
-eval /usr/local/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
+eval /home/tim/cad/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
 drc off
 box 0 0 0 0
 ext2spice $esargs