From c05cbd882ff8c3f9bdd1099cf5cb42ac08fae7a6 Mon Sep 17 00:00:00 2001 From: oetiker Date: Tue, 4 Nov 2008 07:12:46 +0000 Subject: [PATCH] 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/program@1645 a5681a0c-68f1-0310-ab6d-d61299d08faa --- bindings/Makefile.am | 3 +-- bindings/lua/Makefile.am | 2 -- doc/Makefile.am | 5 ++++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 1fa0272..c851597 100644 --- a/bindings/Makefile.am +++ b/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/bindings/lua/Makefile.am b/bindings/lua/Makefile.am index eef4809..f1389d6 100644 --- a/bindings/lua/Makefile.am +++ b/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/doc/Makefile.am b/doc/Makefile.am index 2273ab6..746d5c8 100644 --- a/doc/Makefile.am +++ b/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 -- 2.11.0