avoid problems when building with VPATH set and --disable-perl

fix make test for perl-piped -- Peter Breitenlohner

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

diff --git a/program/bindings/Makefile.am b/program/bindings/Makefile.am
index 57773b70b534d6e255f582e34701819ecc06eec6..e939dc7663695c9c9792720d12308801e7a79c7a 100644 (file)
--- a/program/bindings/Makefile.am
+++ b/program/bindings/Makefile.am
@@ -8,8 +8,8 @@ EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-p
 all-local:  @COMP_PERL@
 
 install-data-local:
-       cd perl-piped && test -f Makefile && $(MAKE) install || true
-       cd perl-shared && test -f Makefile && $(MAKE) install || true
+       test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
+       test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
 
 # rules for building the perl module
 perl_piped: perl-piped/Makefile
@@ -26,7 +26,7 @@ perl-shared/Makefile: perl-shared/Makefile.PL
 # LIBS="$(LDFLAGS) $(LIBS)" $(PERLFLAGS) $(PERL_MAKE_OPTIONS)
 
 clean-local:
-       cd perl-piped && test -f Makefile && $(MAKE) clean || true
-       cd perl-shared && test -f Makefile && $(MAKE) clean || true
+       test -f perl-piped/Makefile && cd perl-piped && $(MAKE) clean || true
+       test -f perl-shared/Makefile && cd perl-shared && $(MAKE) clean || true
 
 ##END##

diff --git a/program/bindings/perl-piped/t/base.t b/program/bindings/perl-piped/t/base.t
index b7de1f55c2d70834b11751ec2d7a62d51a1e4148..5f0b2aee08ac41ece8ec20ebd14fefe573add139 100755 (executable)
--- a/program/bindings/perl-piped/t/base.t
+++ b/program/bindings/perl-piped/t/base.t
@@ -23,7 +23,7 @@ $ok_count = 1;
 
 print "ok 1 module load\n";
 
-ok("RRDp::start", RRDp::start "../src/rrdtool" > 0);
+ok("RRDp::start", RRDp::start "../../src/rrdtool" > 0);
 
 $now=time();
 RRDp::cmd qw(create demo.rrd --start ), $now, qw(--step 100 ),