From: ellson Date: Thu, 3 Jan 2008 02:20:34 +0000 (+0000) Subject: install language bindings in graphviz-/ subdir under each langugaes X-Git-Tag: LAST_LIBGRAPH~32^2~4928 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a2eb9f9604e7090ad8c09102f6d4af7ba39643d;p=graphviz install language bindings in graphviz-/ subdir under each langugaes extensions directory (perl, python, ruby, tcl) --- diff --git a/configure.ac b/configure.ac index 59fb070a4..997cdfe44 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/graphviz.spec.in b/graphviz.spec.in index c464716d2..445d3e95d 100644 --- a/graphviz.spec.in +++ b/graphviz.spec.in @@ -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 diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am index 3370314de..987f8daff 100644 --- a/tclpkg/Makefile.am +++ b/tclpkg/Makefile.am @@ -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 diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am index 27efeb449..8909c3b7c 100644 --- a/tclpkg/gdtclft/Makefile.am +++ b/tclpkg/gdtclft/Makefile.am @@ -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) \ diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index bcbfa5a92..69dae16af 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -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 diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am index 2818f4af6..cdb9449bd 100644 --- 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 = @TCL_INSTALL_DIR@ +pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@ AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am index 493b62d91..7af22da52 100644 --- a/tclpkg/tclpathplan/Makefile.am +++ b/tclpkg/tclpathplan/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = demo -pkgtcldir = @TCL_INSTALL_DIR@ +pkgtcldir = @TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@ AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/tclpkg/tkspline/Makefile.am b/tclpkg/tkspline/Makefile.am index 4ed8609c8..cbaa92cdd 100644 --- a/tclpkg/tkspline/Makefile.am +++ b/tclpkg/tkspline/Makefile.am @@ -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