installing tcl extensions in language preferred subdir, e.g. /usr/lib64/tcl8.5/

diff --git a/configure.ac b/configure.ac
index 3b571af0accebb66e3908064d9cea7a30b369273..59fb070a4470310e4066f7604473b88dd1d60a6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1160,6 +1160,11 @@ if test "$HAVE_TCL" = "1"; then
             fi
         fi
     fi
+    if test -d ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/; then
+       TCL_INSTALL_DIR=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/AC_PACKAGE_NAME-AC_PACKAGE_VERSION
+    else
+       TCL_INSTALL_DIR=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/AC_PACKAGE_NAME/tcl
+    fi
     if test "x$TCLCONFIG" != "x"; then
         AC_MSG_RESULT([using $TCLCONFIG])
         file=${TCLCONFIG}
@@ -1179,6 +1184,7 @@ if test "$HAVE_TCL" = "1"; then
 fi
 
 AC_SUBST(HAVE_TCL)
+AC_SUBST(TCL_INSTALL_DIR)
 
 AM_CONDITIONAL(WITH_TCL, [test "x${HAVE_TCL}" = "x1"])
 

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 260134618f83cb38fba179aae23462cdfec5beb3..c464716d20c7be9a2835424a1107888c170ef6f7 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -468,9 +468,7 @@ Various tcl packages (extensions) for the graphviz tools.
 
 %files tcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/graphviz/tcl
-%{_libdir}/graphviz/tcl/*
-%{_libdir}/graphviz/pkgIndex.tcl
+%{_libdir}/tcl*
 %{_datadir}/graphviz/demo
 # hack to include gv_tcl.n only if available
 #  always includes tcldot.n, gdtclft.n

diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index f5562b7f60f6ad9298455b3b186f01fd25e89e22..3370314dede171afd1bb2ee54f38aed2375ba082 100644 (file)
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-pkgindexdir = $(libdir)/@PACKAGE@
+pkgindexdir = @TCL_INSTALL_DIR@
 pkgindex_DATA = pkgIndex.tcl
 
 SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline gv

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 323d6d89b20f77e35b9962a139a99badab46d70f..27efeb449d861fe3e4500da151efccf2762887a0 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -4,7 +4,7 @@
 SUBDIRS = demo
 
 pdfdir = $(pkgdatadir)/doc/pdf
-pkgtcldir = $(pkglibdir)/tcl
+pkgtcldir = @TCL_INSTALL_DIR@
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index f899da8e27276320817a2956875a024fd05d85bc..bcbfa5a9219d26c2748ca92f276dbc36ba89123d 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -167,7 +167,7 @@ $(RUBY_data): gv_ruby.cpp
 gv_ruby.cpp: gv.i
        $(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
 
-pkgtcldir = $(pkglibdir)/tcl
+pkgtcldir = @TCL_INSTALL_DIR@
 TCL_data = 
 nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_data)
 libgv_tcl_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 6f700481aa17f600d2b99ec163e45f9b6be59a15..2818f4af686aed8ce3aa1c799c8a485c064453a6 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = demo
 pdfdir = $(pkgdatadir)/doc/pdf
 htmldir = $(pkgdatadir)/doc/html
 
-pkgtcldir = $(pkglibdir)/tcl
+pkgtcldir = @TCL_INSTALL_DIR@
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \

diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index 589c746074cd33adaa854b77bb9d2e16c9d72379..493b62d9104dde0276f624e521e9b8774ec43917 100644 (file)
--- a/tclpkg/tclpathplan/Makefile.am
+++ b/tclpkg/tclpathplan/Makefile.am
@@ -3,7 +3,7 @@
 
 SUBDIRS = demo
 
-pkgtcldir = $(pkglibdir)/tcl
+pkgtcldir = @TCL_INSTALL_DIR@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \

diff --git a/tclpkg/tkspline/Makefile.am b/tclpkg/tkspline/Makefile.am
index d1be99ce28cad7bf1c1d9185aba4ad475f81aa96..4ed8609c80a7bc04fa2c9695ccc27447a8900ad2 100644 (file)
--- a/tclpkg/tkspline/Makefile.am
+++ b/tclpkg/tkspline/Makefile.am
@@ -3,7 +3,7 @@
 
 SUBDIRS = demo
 
-pkgtcldir = $(pkglibdir)/tcl
+pkgtcldir = @TCL_INSTALL_DIR@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 man = tkspline.n