build system: Yet another way to solve the src-dir vs. build-dir issue.

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 37e31ea19b0013672da7d4b7f79c9637630a3fc4..16872e88e2159dd4b3db58cc72377a93ccc4f30d 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -11,8 +11,16 @@ clean-local:
 perl: perl/Makefile
        $(MAKE) -C perl
 
-perl/Makefile: perl/Makefile.PL perl/Collectd/Makefile.PL
+perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
        cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
 
+.perl-directory-stamp:
+       if test ! -d perl; then \
+         mkdir -p perl/Collectd; \
+         cp $(srcdir)/perl/{Collectd.pm,Makefile.PL} perl/; \
+         cp $(srcdir)/perl/Collectd/{Unixsock.pm,Makefile.PL} perl/Collectd/; \
+       fi
+       touch $@
+
 .PHONY: perl
 

diff --git a/configure.in b/configure.in
index 3c632c700e35ed72181c00c3a079504f435f1921..75bc00f4271dca477cf1e83b25e2c027e2b47ecd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1936,21 +1936,6 @@ then
        with_perl_bindings="yes ($PERL_BINDINGS_OPTIONS)"
 fi
 
-if test ".." != "$ac_top_srcdir"
-then
-       # we're not building from the source tree
-       for file in \
-                       bindings/perl/Collectd/Makefile.PL \
-                       bindings/perl/Collectd/Unixsock.pm \
-                       bindings/perl/Collectd.pm \
-                       bindings/perl/Makefile.PL
-       do
-               dir=`dirname $file`
-               mkdir -p $dir
-               cp src/$ac_top_srcdir/$file $file
-       done
-fi
-
 cat <<EOF;
 
 Configuration: