let 'out-of tree' builds work for everythin but the perl module -- Peter Breitenlohner

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@628 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index ca6f762..6510f1e 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = @CFLAGS@ -I../../src @PYTHON_INCLUDES@
+AM_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/src @PYTHON_INCLUDES@
 
 #pythondir = $(pyexecdir)/python@PYTHON_VERSION@/site-packages
 
@@ -6,8 +6,8 @@ if BUILD_PYTHON
 
 python_PROGRAMS = rrdtoolmodule.so
 
-rrdtoolmodule_so_LDFLAGS = -module -shared -L../../src
-rrdtoolmodule_so_LDADD = -lrrd
+rrdtoolmodule_so_LDFLAGS = -module -shared
+rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la
 rrdtoolmodule_so_SOURCES =     rrdtoolmodule.c
 
 noinst_HEADERS =                rrd_extra.h

diff --git a/doc/Makefile.am b/doc/Makefile.am
index dc432ac..a4de36c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -53,10 +53,10 @@ all-local: link txt man html-local
        pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
 
 RRDs.pod:
-       ln -s ../bindings/perl-shared/RRDs.pm RRDs.pod
+       ln -s $(top_srcdir)/bindings/perl-shared/RRDs.pm RRDs.pod
 
 RRDp.pod:
-       ln -s ../bindings/perl-piped/RRDp.pm RRDp.pod
+       ln -s $(top_srcdir)/bindings/perl-piped/RRDp.pm RRDp.pod
 
 index.html:
        rm -f index.html; ln -s rrdtool.html index.html