After Tobias Oetiker escreveu:
> I think I have fixed the lua-less build process ...
>
> the conditional is no in luas Makefile.am
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.
If you think it's OK, the attached patch should fix it. It also prevents
installation of rrdlua.pod if lua is not built.
--
Fidelis Assis
diff -ru program-rev1644/bindings/lua/Makefile.am program-rev1644n/bindings/lua/Makefile.am
--- program-rev1644/bindings/lua/Makefile.am 2008-11-03 09:57:47.000000000 -0200
+++ program-rev1644n/bindings/lua/Makefile.am 2008-11-03 10:51:54.000000000 -0200
@@ -14,7 +14,6 @@
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 @@
test: test.lua
$(LUA) test.lua
-endif
diff -ru program-rev1644/bindings/Makefile.am program-rev1644n/bindings/Makefile.am
--- program-rev1644/bindings/Makefile.am 2008-11-03 09:57:48.000000000 -0200
+++ program-rev1644n/bindings/Makefile.am 2008-11-03 10:00:11.000000000 -0200
@@ -1,4 +1,4 @@
-.PHONY: python ruby lua
+.PHONY: python ruby
if BUILD_TCL
SUB_tcl = tcl
@@ -24,7 +24,6 @@
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 -ru program-rev1644/doc/Makefile.am program-rev1644n/doc/Makefile.am
--- program-rev1644/doc/Makefile.am 2008-11-03 09:57:48.000000000 -0200
+++ program-rev1644n/doc/Makefile.am 2008-11-03 10:17:57.000000000 -0200
@@ -13,8 +13,11 @@
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
_______________________________________________
rrd-developers mailing list
[email protected]
https://lists.oetiker.ch/cgi-bin/listinfo/rrd-developers
