add some gv language-binding demos to the distributions

diff --git a/configure.ac b/configure.ac
index 997cdfe4497dfa113f037e6806c99d0165ec69ca..eb3495ddaef68514b043aa5b6ffef62c71162fc4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2368,6 +2368,7 @@ AC_CONFIG_FILES(Makefile
        tclpkg/tkspline/Makefile
        tclpkg/tkspline/demo/Makefile
        tclpkg/gv/Makefile
+       tclpkg/gv/demo/Makefile
        tclpkg/gv/META.gv
        rtest/Makefile
        graphviz.spec

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 69dae16afec515cc4e35023a1d9fa0dec7105ccb..6586b43097d32476bcea288bcbeac29cff97c788 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -1,6 +1,8 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = demo
+
 pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
@@ -99,7 +101,7 @@ gv.cmx: gv.ml gv.cma
 gv.cmxa gv.a: gv.cma
        ocamlopt -a -o gv.cmxa
 
-pkgperldir = @PERL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
+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 +121,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@/@PACKAGE_NAME@-@PACKAGE_VERSION@
+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 +131,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@/@PACKAGE_NAME@-@PACKAGE_VERSION@
+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 = @PYTHON24_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
+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 = @PYTHON25_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@
+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 +159,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@/@PACKAGE_NAME@-@PACKAGE_VERSION@
+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
@@ -437,7 +439,7 @@ test_tcl: libgv_tcl.la
                ln -fs ../$(srcdir)/*.dot ../$(srcdir)/*.tcl .; \
                $(TCLSH) ./test.tcl)
 
-EXTRA_DIST = demo/* $(man) $(pdf) gv_doc_*.tcl
+EXTRA_DIST = $(man) $(pdf) gv_doc_*.tcl
 
 CLEANFILES = test_*/* pkgIndex.tcl \
        gv_sharp.cpp $(SHARP_data) \