Apply changes from Gentoo to install python/perl/ruby bindings in their language...

diff --git a/configure.ac b/configure.ac
index c44a418f6456166ba508c30cefaeec4e3b01f59b..0770a895ec87dff9522a95b69f2db51c2ea49422 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -761,6 +761,7 @@ if test "x$PERL" != "x"; then
   PERL_ARCHLIB=`$PERL -e 'use Config; print $Config{archlib};'`
   PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
   PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
+  PERL_INSTALL_DIR="`$PERL -e 'use Config; print $Config{vendorarch};'`"
   save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $PERL_INCLUDES"
   AC_CHECK_HEADER(EXTERN.h,,[
@@ -771,6 +772,7 @@ if test "x$PERL" != "x"; then
 fi
 AC_SUBST(PERL_INCLUDES)
 AC_SUBST(PERL_LIBS)
+AC_SUBST(PERL_INSTALL_DIR)
 fi
 fi
 AM_CONDITIONAL(WITH_PERL, [test "x$PERL" != "x"])
@@ -845,6 +847,7 @@ if test "x$PYTHON" != "x"; then
     PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
     PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
     PYTHON_LIBS="-L$PYTHON_PREFIX/lib$LIBPOSTFIX/python$PYTHON_VERSION_SHORT/config"
+    PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
     save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
     AC_CHECK_HEADER(Python.h,,[
@@ -856,6 +859,7 @@ if test "x$PYTHON" != "x"; then
 fi
 AC_SUBST(PYTHON_INCLUDES)
 AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_INSTALL_DIR)
 fi
 fi
 fi
@@ -898,6 +902,7 @@ if test "x$PYTHON23" != "x"; then
     PYTHON23_PREFIX=`$PYTHON23 -c "import sys; print sys.prefix"`
     PYTHON23_INCLUDES=-I$PYTHON23_PREFIX/include/python$PYTHON23_VERSION_SHORT
     PYTHON23_LIBS="-L$PYTHON23_PREFIX/lib$LIBPOSTFIX"
+    PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"
     save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $PYTHON23_INCLUDES"
     AC_CHECK_HEADER(Python.h,,[
@@ -909,6 +914,7 @@ if test "x$PYTHON23" != "x"; then
 fi
 AC_SUBST(PYTHON23_INCLUDES)
 AC_SUBST(PYTHON23_LIBS)
+AC_SUBST(PYTHON23_INSTALL_DIR)
 fi
 fi
 fi
@@ -951,6 +957,7 @@ if test "x$PYTHON24" != "x"; then
     PYTHON24_PREFIX=`$PYTHON24 -c "import sys; print sys.prefix"`
     PYTHON24_INCLUDES=-I$PYTHON24_PREFIX/include/python$PYTHON24_VERSION_SHORT
     PYTHON24_LIBS="-L$PYTHON24_PREFIX/lib$LIBPOSTFIX"
+    PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"
     save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $PYTHON24_INCLUDES"
     AC_CHECK_HEADER(Python.h,,[
@@ -962,6 +969,7 @@ if test "x$PYTHON24" != "x"; then
 fi
 AC_SUBST(PYTHON24_INCLUDES)
 AC_SUBST(PYTHON24_LIBS)
+AC_SUBST(PYTHON24_INSTALL_DIR)
 fi
 fi
 fi
@@ -1004,6 +1012,7 @@ if test "x$PYTHON25" != "x"; then
     PYTHON25_PREFIX=`$PYTHON25 -c "import sys; print sys.prefix"`
     PYTHON25_INCLUDES=-I$PYTHON25_PREFIX/include/python$PYTHON25_VERSION_SHORT
     PYTHON25_LIBS="-L$PYTHON25_PREFIX/lib$LIBPOSTFIX"
+    PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"
     save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $PYTHON25_INCLUDES"
     AC_CHECK_HEADER(Python.h,,[
@@ -1015,6 +1024,7 @@ if test "x$PYTHON25" != "x"; then
 fi
 AC_SUBST(PYTHON25_INCLUDES)
 AC_SUBST(PYTHON25_LIBS)
+AC_SUBST(PYTHON25_INSTALL_DIR)
 fi
 fi
 fi
@@ -1035,8 +1045,6 @@ else
 PKG_CHECK_MODULES(R, [libR],
         [R=1],
         [AC_MSG_WARN(R library not available.)])
-
-
 fi
 fi
 fi
@@ -1060,6 +1068,7 @@ AC_CHECK_PROG(RUBY,ruby,ruby)
 if test "x$RUBY" != "x"; then
   RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
   RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
+  RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
   save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
   AC_CHECK_HEADER(ruby.h,,[
@@ -1070,6 +1079,7 @@ if test "x$RUBY" != "x"; then
 fi
 AC_SUBST(RUBY_INCLUDES)
 AC_SUBST(RUBY_LIBS)
+AC_SUBST(RUBY_INSTALL_DIR)
 fi
 fi
 fi

diff --git a/graphviz.spec.in b/graphviz.spec.in
index cddc83e897874d480abf68d4da0dddb6e70ecf50..50e598c298b1a4f493b038f146eb266b2efbc2fb 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -384,8 +384,7 @@ Perl extension for graphviz.
 
 %files perl
 %defattr(-,root,root,-)
-%dir %{_libdir}/graphviz/perl
-%{_libdir}/graphviz/perl/*
+%{_libdir}/perl*
 %{_mandir}/mann/gv_perl.n*
 %endif
 
@@ -418,8 +417,7 @@ Python extension for graphviz.
 
 %files python
 %defattr(-,root,root,-)
-%dir %{_libdir}/graphviz/python
-%{_libdir}/graphviz/python/*
+%{_libdir}/python*
 %{_mandir}/mann/gv_python.n*
 %endif
 
@@ -452,8 +450,7 @@ Ruby extension for graphviz.
 
 %files ruby
 %defattr(-,root,root,-)
-%dir %{_libdir}/graphviz/ruby
-%{_libdir}/graphviz/ruby/*
+%{_libdir}/ruby*
 %{_mandir}/mann/gv_ruby.n*
 %endif
 

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index ffdf0a63cc2aff651af49a71667a6c594cd9266f..1232f22f416367804a90c8f7cd3620dd354941ad 100644 (file)
--- 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 = $(pkglibdir)/perl
+pkgperldir = @PERL_INSTALL_DIR@
 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 = $(pkglibdir)/python
+pkgpythondir = @PYTHON_INSTALL_DIR@
 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 = $(pkglibdir)/python23
+pkgpython23dir = @PYTHON23_INSTALL_DIR@
 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 = $(pkglibdir)/python24
+pkgpython24dir = @PYTHON24_INSTALL_DIR@
 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 = $(pkglibdir)/python25
+pkgpython25dir = @PYTHON25_INSTALL_DIR@
 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 = $(pkglibdir)/ruby
+pkgrubydir = @RUBY_INSTALL_DIR@
 RUBY_data = 
 nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_data)
 libgv_ruby_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
@@ -308,15 +308,33 @@ $(man): gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
        -groff -Tps -man $< | ps2pdf - - >$@
 
 install-data-hook:
+if WITH_LUA
        (cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
+endif
+if WITH_PERL
        (cd $(DESTDIR)$(pkgperldir);   rm -f gv.so;  $(LN_S) libgv_perl.so gv.so;)
+endif
+if WITH_PYTHON
        (cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
+endif
+if WITH_PYTHON23
        (cd $(DESTDIR)$(pkgpython23dir); rm -f _gv.so; $(LN_S) libgv_python23.so _gv.so;)
+endif
+if WITH_PYTHON24
        (cd $(DESTDIR)$(pkgpython24dir); rm -f _gv.so; $(LN_S) libgv_python24.so _gv.so;)
+endif
+if WITH_PYTHON25
        (cd $(DESTDIR)$(pkgpython25dir); rm -f _gv.so; $(LN_S) libgv_python25.so _gv.so;)
+endif
+if WITH_R
        (cd $(DESTDIR)$(pkgrdir);   rm -f gv.so;  $(LN_S) libgv_r.so gv.so;)
+endif
+if WITH_RUBY
        (cd $(DESTDIR)$(pkgrubydir);   rm -f gv.so;  $(LN_S) libgv_ruby.so gv.so;)
+endif
+if WITH_TCL
        (cd $(DESTDIR)$(pkgtcldir);    rm -f gv.so;  $(LN_S) libgv_tcl.so gv.so;)
+endif
 
 uninstall-hook:
        (cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;)