From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 27 Dec 2007 15:39:46 +0000 (+0100)
Subject: Revert "bindings/Makefile.am: Fix a bug that happened when src and build directory... 
X-Git-Tag: collectd-4.2.3~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=87fd2319a4b26130c114cdf97e1c5104b12ab41a;p=collectd.git

Revert "bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same."

This reverts commit 61f5c1a972626212aab60c4d50f45097485b8e51 which had the
following problems:

 * parts of the build process took place in the source directory (which should
   be read-only though)

 * the "perl" target should not be renamed - the name is used in
   @PERL_BINDINGS@ to identify the bindings that are supposed to be built

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
---

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 5aa49435..37e31ea1 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,20 +1,18 @@
 EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL perl/Collectd/Makefile.PL perl/Collectd/Unixsock.pm
 
-PERL_SUBDIR = $(srcdir)/perl
-
 all-local: @PERL_BINDINGS@
 
 install-exec-local:
-	[ ! -f $(PERL_SUBDIR)/Makefile ] || $(MAKE) -C $(PERL_SUBDIR) install
+	[ ! -f perl/Makefile ] || $(MAKE) -C perl install
 
 clean-local:
-	[ ! -f $(PERL_SUBDIR)/Makefile ] || $(MAKE) -C $(PERL_SUBDIR) realclean
+	[ ! -f perl/Makefile ] || $(MAKE) -C perl realclean
 
-@srcdir@/perl: $(PERL_SUBDIR)/Makefile
-	$(MAKE) -C $(PERL_SUBDIR)
+perl: perl/Makefile
+	$(MAKE) -C perl
 
-@srcdir@/perl/Makefile: @srcdir@/perl/Makefile.PL @srcdir@/perl/Collectd/Makefile.PL
-	cd $(PERL_SUBDIR) && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
+perl/Makefile: perl/Makefile.PL perl/Collectd/Makefile.PL
+	cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
 
-.PHONY: @srcdir@/perl
+.PHONY: perl