Code

Revert "bindings/Makefile.am: Fix a bug that happened when src and build directory...
authorSebastian Harl <sh@tokkee.org>
Thu, 27 Dec 2007 15:39:46 +0000 (16:39 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 27 Dec 2007 16:40:43 +0000 (17:40 +0100)
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>
bindings/Makefile.am

index 5aa49435fea620fa0d32ecf6a04bf523c248ebb6..37e31ea19b0013672da7d4b7f79c9637630a3fc4 100644 (file)
@@ -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