From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 10 Jan 2008 08:49:02 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~42
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b49f3f8aca3b42e64427259dfc6c75242d37b91c;p=collectd.git

Merge branch 'collectd-4.2'
---

b49f3f8aca3b42e64427259dfc6c75242d37b91c
diff --cc bindings/Makefile.am
index 1c604e19,c7247252..620389fa
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@@ -4,16 -3,15 +4,16 @@@ EXTRA_DIST = perl/Collectd.pm perl/Make
  all-local: @PERL_BINDINGS@
  
  install-exec-local:
- 	[ ! -f perl/Makefile ] || $(MAKE) -C perl install
+ 	[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install )
  
  clean-local:
- 	[ ! -f perl/Makefile ] || $(MAKE) -C perl realclean
+ 	[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean )
  
  perl: perl/Makefile
- 	$(MAKE) -C perl
+ 	cd perl && $(MAKE)
  
 -perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
 +perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
 +	perl/Collectd/Makefile.PL $(top_builddir)/config.status
  	cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
  
  .perl-directory-stamp: