install language bindings in graphviz-<version>/ subdir under each langugaes
authorellson <devnull@localhost>
Thu, 3 Jan 2008 02:20:34 +0000 (02:20 +0000)
committerellson <devnull@localhost>
Thu, 3 Jan 2008 02:20:34 +0000 (02:20 +0000)
extensions directory (perl, python, ruby, tcl)

configure.ac
graphviz.spec.in
tclpkg/Makefile.am
tclpkg/gdtclft/Makefile.am
tclpkg/gv/Makefile.am
tclpkg/tcldot/Makefile.am
tclpkg/tclpathplan/Makefile.am
tclpkg/tkspline/Makefile.am

index 59fb070a4470310e4066f7604473b88dd1d60a6d..997cdfe4497dfa113f037e6806c99d0165ec69ca 100644 (file)
@@ -1161,9 +1161,7 @@ if test "$HAVE_TCL" = "1"; then
         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
+       TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
     fi
     if test "x$TCLCONFIG" != "x"; then
         AC_MSG_RESULT([using $TCLCONFIG])
index c464716d20c7be9a2835424a1107888c170ef6f7..445d3e95de4fc7da868df1235058b0451ee24471 100644 (file)
@@ -386,7 +386,7 @@ Perl extension for graphviz.
 
 %files perl
 %defattr(-,root,root,-)
-%{_libdir}/perl*
+%{_libdir}/perl*/*
 %{_mandir}/mann/gv_perl.n*
 %endif
 
@@ -419,7 +419,7 @@ Python extension for graphviz.
 
 %files python
 %defattr(-,root,root,-)
-%{_libdir}/python*
+%{_libdir}/python*/*
 %{_mandir}/mann/gv_python.n*
 %endif
 
@@ -452,7 +452,7 @@ Ruby extension for graphviz.
 
 %files ruby
 %defattr(-,root,root,-)
-%{_libdir}/*ruby*
+%{_libdir}/*ruby*/*
 %{_mandir}/mann/gv_ruby.n*
 %endif
 
@@ -468,7 +468,7 @@ Various tcl packages (extensions) for the graphviz tools.
 
 %files tcl
 %defattr(-,root,root,-)
-%{_libdir}/tcl*
+%{_libdir}/tcl*/*
 %{_datadir}/graphviz/demo
 # hack to include gv_tcl.n only if available
 #  always includes tcldot.n, gdtclft.n
index 3370314dede171afd1bb2ee54f38aed2375ba082..987f8daff90ef7b3dee571939f87bd788b4d8e31 100644 (file)
@@ -1,7 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-pkgindexdir = @TCL_INSTALL_DIR@
+pkgindexdir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 pkgindex_DATA = pkgIndex.tcl
 
 SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline gv
index 27efeb449d861fe3e4500da151efccf2762887a0..8909c3b7cb1a30641aa60d35193dc72f9ed39d5e 100644 (file)
@@ -4,7 +4,7 @@
 SUBDIRS = demo
 
 pdfdir = $(pkgdatadir)/doc/pdf
-pkgtcldir = @TCL_INSTALL_DIR@
+pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
index bcbfa5a9219d26c2748ca92f276dbc36ba89123d..69dae16afec515cc4e35023a1d9fa0dec7105ccb 100644 (file)
@@ -99,7 +99,7 @@ gv.cmx: gv.ml gv.cma
 gv.cmxa gv.a: gv.cma
        ocamlopt -a -o gv.cmxa
 
-pkgperldir = @PERL_INSTALL_DIR@
+pkgperldir = @PERL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 PERL_data = gv.pm
 nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
 libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
@@ -119,7 +119,7 @@ $(PHP_data): gv_php.cpp
 gv_php.cpp: gv.i
        $(SWIG) -c++ -php5 -o gv_php.cpp $(srcdir)/gv.i
 
-pkgpythondir = @PYTHON_INSTALL_DIR@
+pkgpythondir = @PYTHON_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 PYTHON_data = gv.py
 nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_data)
 libgv_python_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
@@ -129,19 +129,19 @@ $(PYTHON_data): gv_python.cpp
 gv_python.cpp: gv.i
        $(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
 
-pkgpython23dir = @PYTHON23_INSTALL_DIR@
+pkgpython23dir = @PYTHON23_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 nodist_libgv_python23_la_SOURCES = $(nodist_libgv_python_la_SOURCES)
 libgv_python23_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
 libgv_python23_la_LIBADD = $(BASELIBS) @PYTHON23_LIBS@
 libgv_python23_la_LDFLAGS = -module -avoid-version
 
-pkgpython24dir = @PYTHON24_INSTALL_DIR@
+pkgpython24dir = @PYTHON24_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 nodist_libgv_python24_la_SOURCES = $(nodist_libgv_python_la_SOURCES)
 libgv_python24_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
 libgv_python24_la_LIBADD = $(BASELIBS) @PYTHON24_LIBS@
 libgv_python24_la_LDFLAGS = -module -avoid-version
 
-pkgpython25dir = @PYTHON25_INSTALL_DIR@
+pkgpython25dir = @PYTHON25_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 nodist_libgv_python25_la_SOURCES = $(nodist_libgv_python_la_SOURCES)
 libgv_python25_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
 libgv_python25_la_LIBADD = $(BASELIBS) @PYTHON25_LIBS@
@@ -157,7 +157,7 @@ $(R_data): gv_R.cpp
 gv_R.cpp: gv.i
        $(SWIG) -c++ -r -o gv_R.cpp $(srcdir)/gv.i
 
-pkgrubydir = @RUBY_INSTALL_DIR@
+pkgrubydir = @RUBY_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 RUBY_data = 
 nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_data)
 libgv_ruby_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
@@ -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 = @TCL_INSTALL_DIR@
+pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 TCL_data = 
 nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_data)
 libgv_tcl_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
index 2818f4af686aed8ce3aa1c799c8a485c064453a6..cdb9449bd746c5b21f7b3946e05cc48eb162eb1c 100644 (file)
@@ -6,7 +6,7 @@ SUBDIRS = demo
 pdfdir = $(pkgdatadir)/doc/pdf
 htmldir = $(pkgdatadir)/doc/html
 
-pkgtcldir = @TCL_INSTALL_DIR@
+pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
index 493b62d9104dde0276f624e521e9b8774ec43917..7af22da521389f6c2ccd0b5986fe39f1caec2649 100644 (file)
@@ -3,7 +3,7 @@
 
 SUBDIRS = demo
 
-pkgtcldir = @TCL_INSTALL_DIR@
+pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
index 4ed8609c80a7bc04fa2c9695ccc27447a8900ad2..cbaa92cdda1eaa9d6fb9f2a694751adc1af00f08 100644 (file)
@@ -3,7 +3,7 @@
 
 SUBDIRS = demo
 
-pkgtcldir = @TCL_INSTALL_DIR@
+pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 man = tkspline.n