From e5c6a442843929db1880035866fd6b21026dda56 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 8 Dec 2009 17:57:51 +0100 Subject: [PATCH] bindings/perl: Move the files into the default directory structure for ExtUtils::MakeMaker. --- bindings/Makefile.am | 5 ++--- bindings/perl/Collectd/Makefile.PL | 8 -------- bindings/perl/{ => lib}/Collectd.pm | 0 bindings/perl/{ => lib}/Collectd/Unixsock.pm | 0 4 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 bindings/perl/Collectd/Makefile.PL rename bindings/perl/{ => lib}/Collectd.pm (100%) rename bindings/perl/{ => lib}/Collectd/Unixsock.pm (100%) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index fb68657c..1a28e290 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -4,7 +4,7 @@ if BUILD_WITH_JAVA SUBDIRS += java endif -EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL perl/Collectd/Makefile.PL \ +EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL \ perl/Collectd/Unixsock.pm all-local: @PERL_BINDINGS@ @@ -19,7 +19,7 @@ perl: perl/Makefile cd perl && $(MAKE) perl/Makefile: .perl-directory-stamp perl/Makefile.PL \ - perl/Collectd/Makefile.PL $(top_builddir)/config.status + $(top_builddir)/config.status cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@ .perl-directory-stamp: @@ -28,7 +28,6 @@ perl/Makefile: .perl-directory-stamp perl/Makefile.PL \ 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/; \ fi touch $@ diff --git a/bindings/perl/Collectd/Makefile.PL b/bindings/perl/Collectd/Makefile.PL deleted file mode 100644 index baf71662..00000000 --- a/bindings/perl/Collectd/Makefile.PL +++ /dev/null @@ -1,8 +0,0 @@ -use ExtUtils::MakeMaker; - -WriteMakefile( - 'NAME' => 'Collectd::Unixsock', - 'AUTHOR' => 'Florian Forster ', -); - -# vim: set sw=4 ts=4 tw=78 noexpandtab : diff --git a/bindings/perl/Collectd.pm b/bindings/perl/lib/Collectd.pm similarity index 100% rename from bindings/perl/Collectd.pm rename to bindings/perl/lib/Collectd.pm diff --git a/bindings/perl/Collectd/Unixsock.pm b/bindings/perl/lib/Collectd/Unixsock.pm similarity index 100% rename from bindings/perl/Collectd/Unixsock.pm rename to bindings/perl/lib/Collectd/Unixsock.pm -- 2.11.0