From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Sat, 11 Jun 2005 05:41:31 +0000 (+0000)
Subject: avoid problems when building with VPATH set and --disable-perl
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5077f1084e91d1e8018b28f992c0c4af8c750ac5;p=rrdtool.git

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/program@629 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 57773b7..e939dc7 100644
--- a/bindings/Makefile.am
+++ b/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/bindings/perl-piped/t/base.t b/bindings/perl-piped/t/base.t
index b7de1f5..5f0b2ae 100755
--- a/bindings/perl-piped/t/base.t
+++ b/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 ),