diff -Naur xotcl-1.2.1-orig+distclean/Makefile.in xotcl-1.2.1/Makefile.in --- xotcl-1.2.1-orig+distclean/Makefile.in Sun Jun 13 13:24:25 2004 +++ xotcl-1.2.1/Makefile.in Mon Jun 14 06:20:05 2004 @@ -165,6 +165,7 @@ SHARED_BUILD = @SHARED_BUILD@ INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ +XOTCL_LIB_PATH = @XOTCL_LIB_PATH@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ @PKG_CFLAGS@ # TCL_DEFS is not strictly need here, but if you remove it, then you @@ -481,15 +482,15 @@ @mkdir -p $(DESTDIR)$(pkglibdir) @list='$(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(XOTCL_LIB_PATH)/$$p"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(XOTCL_LIB_PATH)/$$p; \ stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ if test "x$$stub" = "xstub"; then \ - echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ - $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + echo " $(RANLIB_STUB) $(DESTDIR)$(XOTCL_LIB_PATH)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(XOTCL_LIB_PATH)/$$p; \ else \ - echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + echo " $(RANLIB) $(DESTDIR)$(XOTCL_LIB_PATH)/$$p"; \ + $(RANLIB) $(DESTDIR)$(XOTCL_LIB_PATH)/$$p; \ fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ diff -Naur xotcl-1.2.1-orig+distclean/configure.in xotcl-1.2.1/configure.in --- xotcl-1.2.1-orig+distclean/configure.in Sun Jun 13 13:52:53 2004 +++ xotcl-1.2.1/configure.in Mon Jun 14 06:13:25 2004 @@ -326,8 +326,15 @@ # # XOTcl specific configs # + +# +# XOTCL_LIB_PATH can be set to the dir you want the libs to be installed +# in. The default value is a reasonable default. The 'make install' +# target should use its value as the place to install the libs. +# +XOTCL_LIB_PATH="${exec_prefix}/lib" XOTCL_BUILD_LIB_SPEC="-L`pwd` -lxotcl${PACKAGE_VERSION}" -XOTCL_LIB_SPEC="-L${exec_prefix}/lib -lxotcl${PACKAGE_VERSION}" +XOTCL_LIB_SPEC="-L${XOTCL_LIB_PATH} -lxotcl${PACKAGE_VERSION}" # stub libs are not build for 8.0 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then @@ -337,14 +344,15 @@ XOTCL_STUB_LIB_PATH="" else XOTCL_BUILD_STUB_LIB_SPEC="-L`pwd` -lxotclstub${PACKAGE_VERSION}" - XOTCL_STUB_LIB_SPEC="-L${exec_prefix}/lib -lxotclstub${PACKAGE_VERSION}" + XOTCL_STUB_LIB_SPEC="-L${XOTCL_LIB_PATH} -lxotclstub${PACKAGE_VERSION}" XOTCL_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" - XOTCL_STUB_LIB_PATH="${exec_prefix}/lib/${PKG_STUB_LIB_FILE}" + XOTCL_STUB_LIB_PATH="${XOTCL_LIB_PATH}/${PKG_STUB_LIB_FILE}" AC_DEFINE(COMPILE_XOTCL_STUBS) fi AC_SUBST(SHARED_LIB_SUFFIX) AC_SUBST(UNSHARED_LIB_SUFFIX) +AC_SUBST(XOTCL_LIB_PATH) AC_SUBST(XOTCL_BUILD_LIB_SPEC) AC_SUBST(XOTCL_LIB_SPEC) AC_SUBST(XOTCL_BUILD_STUB_LIB_SPEC)