File fixtclshpath.patch of Package magic

Overview Repositories Revisions Requests Users Attributes Meta

File fixtclshpath.patch of Package magic

diff --git a/scripts/configure b/scripts/configure
index 2c98d11..9b31fbd 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -745,7 +745,6 @@ ac_user_opts='
 enable_option_checking
 with_gnu_ld
 with_x
-with_distdir
 with_interpreter
 with_tcl
 with_tk
@@ -1425,7 +1424,6 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-x                use the X Window System
-  --with-distdir=DIR	    install into location DIR for distribution
   --with-interpreter=arg	enable interpreter (tcl, scheme, or no)
   --with-tcl=DIR          Find tclConfig.sh in DIR
   --with-tk=DIR           Find tkConfig.sh in DIR
@@ -6078,24 +6076,6 @@ else
   fi
 fi
 
-# For distributed installs, where the run-time files are installed in a
-# 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_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_DIR="\${exec_prefix}"
-  else
-     DIST_DIR=${withval}
-  fi
-
-fi
-
-
 # Check for libXi, which is required on some systems but not available on
 # others.
 use_libxi=""
diff --git a/scripts/configure.in b/scripts/configure.in
index d98efbf..f34a729 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -335,20 +335,6 @@ else
   fi
 fi
 
-# For distributed installs, where the run-time files are installed in a
-# 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_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_DIR="\${exec_prefix}"
-  else
-     DIST_DIR=${withval}
-  fi
-], )
-
 # Check for libXi, which is required on some systems but not available on
 # others.
 use_libxi=""
diff --git a/scripts/defs.mak.in b/scripts/defs.mak.in
index 77dfddc..e1121cd 100755
--- a/scripts/defs.mak.in
+++ b/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_DIR@/bin
-INSTALL_MANDIR         = @DIST_DIR@/share/man
-INSTALL_LIBDIR         = @DIST_DIR@/lib
+INSTALL_BINDIR         = @DIST_DIR@/${bindir}
+INSTALL_MANDIR         = @DIST_DIR@/${mandir}
+INSTALL_LIBDIR         = @DIST_DIR@/${libdir}
 INSTALL_SYSDIR         = ${INSTALL_LIBDIR}/magic/sys
 INSTALL_SCMDIR         = ${INSTALL_LIBDIR}/magic/scm
 INSTALL_TCLDIR         = ${INSTALL_LIBDIR}/magic/tcl
diff --git a/tcltk/strip_reflibs.tcl b/tcltk/strip_reflibs.tcl
index 897347b..cd7bb2d 100755
--- a/tcltk/strip_reflibs.tcl
+++ b/tcltk/strip_reflibs.tcl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/tclsh
+#!/usr/bin/tclsh
 #
 # Strip GDS cell references from magic files.
 #

Places

File fixtclshpath.patch of Package magic

Places