I realize now that the problem is the line

    test -f lua/Makefile && cd lua && $(MAKE) install || true

in the target "install-data-local", in bindings/Makefile.am. It forces
execution of bindings/lua/Makefile independently of lua being found or
not. I added that line in my first patch, following perl, python and
ruby build style, but it's not needed after I switched to automake. The
make recursion is controlled by SUBDIRS, which will only contain "lua"
if BUILD_LUA is true.

-- Fidelis Assis

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1645 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/bindings/Makefile.am b/program/bindings/Makefile.am
index 1fa0272b5e7590f07ee0f4f71bac3f6a92aba01f..c851597f4084b77a49850c32fd9cc609f8cde2d2 100644 (file)
--- a/program/bindings/Makefile.am
+++ b/program/bindings/Makefile.am
@@ -1,4 +1,4 @@
-.PHONY: python ruby lua
+.PHONY: python ruby
 
 if BUILD_TCL
 SUB_tcl = tcl
@@ -24,7 +24,6 @@ install-data-local:
        test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
        test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
        test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
-       test -f lua/Makefile && cd lua && $(MAKE) install || true
 
 # rules for building the ruby module
 # RUBYARCHDIR= is to work around in a makefile quirk not sure 

diff --git a/program/bindings/lua/Makefile.am b/program/bindings/lua/Makefile.am
index eef4809cf8891f3bf9934c583250d9056da623d1..f1389d6290cfea85ed959fbf5a309c506d237cd4 100644 (file)
--- a/program/bindings/lua/Makefile.am
+++ b/program/bindings/lua/Makefile.am
@@ -14,7 +14,6 @@ LUA_LFLAGS          = @LUA_LFLAGS@
 
 CLEANFILES = rrd.o rrd.so test.lua test.rrd test.png
 
-if BUILD_LUA
 lualibdir=$(LUA_INSTALL_CMOD)
 lualib_LTLIBRARIES = rrd.la
 if LUA_NEED_OUR_COMPAT51
@@ -65,4 +64,3 @@ endif
 test: test.lua
        $(LUA) test.lua
 
-endif

diff --git a/program/doc/Makefile.am b/program/doc/Makefile.am
index 2273ab6b639ea2af735766e292ed6755855dec35..746d5c8f6a3cae7146ea0bf748a2945d4f1b23c3 100644 (file)
--- a/program/doc/Makefile.am
+++ b/program/doc/Makefile.am
@@ -13,8 +13,11 @@ POD = bin_dec_hex.pod        rrddump.pod            rrdgraph_examples.pod  rrdre
       rpntutorial.pod        rrdfirst.pod           rrdgraph_rpn.pod       rrdtool.pod            rrdcached.pod  \
       rrd-beginners.pod      rrdinfo.pod            rrdtune.pod            rrdbuild.pod           rrdflush.pod   \
       rrdcgi.pod             rrdgraph.pod           rrdlast.pod            rrdlastupdate.pod                     \
-      rrdcreate.pod          rrdgraph_data.pod      rrdresize.pod          rrdtutorial.pod        rrdlua.pod
+      rrdcreate.pod          rrdgraph_data.pod      rrdresize.pod          rrdtutorial.pod
 
+if BUILD_LUA
+  POD += rrdlua.pod
+endif
 
 PMP = RRDs.pod RRDp.pod