X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=bindings%2FMakefile.am;h=07373e87a62bd67c66cee878c0c389ab8e6d1e2d;hp=fb68657c777b55f93487cd6a47ea58ee9eeee783;hb=80294418289129eb75c9f07e2043adcbd02941a4;hpb=658c85755ef1f4284228d1e5edbc4452a31bd944

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index fb68657c..07373e87 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -4,31 +4,64 @@ if BUILD_WITH_JAVA
 SUBDIRS += java
 endif
 
-EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL perl/Collectd/Makefile.PL \
-		perl/Collectd/Unixsock.pm
+EXTRA_DIST = perl/Makefile.PL \
+	     perl/uninstall_mod.pl \
+	     perl/lib/Collectd.pm \
+	     perl/lib/Collectd/Unixsock.pm \
+	     perl/lib/Collectd/Plugins/Monitorus.pm \
+	     perl/lib/Collectd/Plugins/OpenVZ.pm
+
+CLEANFILES = \
+	buildperl/Collectd.pm \
+	buildperl/Collectd/Plugins/OpenVZ.pm \
+	buildperl/Collectd/Unixsock.pm \
+	buildperl/Makefile.PL \
+	.perl-directory-stamp
+
+DISTCLEANFILES = \
+	buildperl/Collectd.pm \
+	buildperl/Collectd/Plugins/OpenVZ.pm \
+	buildperl/Collectd/Unixsock.pm \
+	buildperl/Makefile.PL \
+	.perl-directory-stamp
 
 all-local: @PERL_BINDINGS@
 
+
 install-exec-local:
-	[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install )
+	[ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install )
+
+# Perl 'make uninstall' does not work as well as wanted.
+# So we do the work here.
+uninstall-local:
+	@PERL@ -I$(DESTDIR)$(prefix) $(srcdir)/perl/uninstall_mod.pl Collectd
+	find $(DESTDIR)$(prefix) -name "perllocal.pod" -exec rm {} \;
 
 clean-local:
-	[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean )
+	rm -rf buildperl
+
+perl: buildperl/Makefile
+	cd buildperl && $(MAKE)
 
-perl: perl/Makefile
-	cd perl && $(MAKE)
+buildperl/Makefile: .perl-directory-stamp buildperl/Makefile.PL \
+	$(top_builddir)/config.status
+	@# beautify the output a bit
+	@echo 'cd buildperl && @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@'
+	@cd buildperl && ( if ! @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@; then \
+			echo ""; \
+			echo 'Check whether you have set $$PERL_MM_OPT in your environment and try using ./configure --with-perl-bindings=""'; \
+			echo ""; \
+		fi )
 
-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@
+buildperl/Makefile.PL: .perl-directory-stamp $(top_builddir)/config.status
 
 .perl-directory-stamp:
-	if test ! -d perl; then \
-	  mkdir -p perl/Collectd; \
-	  cp $(srcdir)/perl/Collectd.pm perl/; \
-	  cp $(srcdir)/perl/Makefile.PL perl/; \
-	  cp $(srcdir)/perl/Collectd/Unixsock.pm perl/Collectd/; \
-	  cp $(srcdir)/perl/Collectd/Makefile.PL perl/Collectd/; \
+	if test ! -d buildperl; then \
+	  mkdir -p buildperl/Collectd/Plugins; \
+	  cp $(srcdir)/perl/lib/Collectd.pm buildperl/; \
+	  cp $(srcdir)/perl/Makefile.PL buildperl/; \
+	  cp $(srcdir)/perl/lib/Collectd/Unixsock.pm buildperl/Collectd/; \
+	  cp $(srcdir)/perl/lib/Collectd/Plugins/OpenVZ.pm buildperl/Collectd/Plugins/; \
 	fi
 	touch $@