r7563 - in /trunk/dh-make-perl: debian/changelog debian/control rules.MakeMaker.noxs rules.MakeMaker.xs
hanska-guest at users.alioth.debian.org
hanska-guest at users.alioth.debian.org
Thu Sep 13 20:58:07 UTC 2007
Author: hanska-guest
Date: Thu Sep 13 20:58:07 2007
New Revision: 7563
URL: http://svn.debian.org/wsvn/?sc=1&rev=7563
Log:
Using environment variables to influence MakeMaker behaviour
Modified:
trunk/dh-make-perl/debian/changelog
trunk/dh-make-perl/debian/control
trunk/dh-make-perl/rules.MakeMaker.noxs
trunk/dh-make-perl/rules.MakeMaker.xs
Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/debian/changelog?rev=7563&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Sep 13 20:58:07 2007
@@ -1,3 +1,12 @@
+dh-make-perl (0.31) unstable; urgency=low
+
+ * rules.MakeMaker.*: changed approach to the removal of unneeded (and
+ unwanted) dirs:
+ - /usr/lib/perl5/ for architecture-independent packages;
+ - /usr/share/perl5/ for architecture-dependent packages
+
+ -- David Paleino <d.paleino at gmail.com> Thu, 13 Sep 2007 22:50:06 +0200
+
dh-make-perl (0.30) unstable; urgency=low
[ Gunnar Wolf ]
Modified: trunk/dh-make-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/debian/control?rev=7563&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/control (original)
+++ trunk/dh-make-perl/debian/control Thu Sep 13 20:58:07 2007
@@ -6,7 +6,8 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>, Wolfgang Schemmel <debian at 37.org>,
Christopher Sacca <csacca at thecsl.org>,
- Damyan Ivanov <dmn at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
+ Damyan Ivanov <dmn at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>,
+ David Paleino <d.paleino at gmail.com>
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/dh-make-perl/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/
Modified: trunk/dh-make-perl/rules.MakeMaker.noxs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.MakeMaker.noxs?rev=7563&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.noxs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.noxs Thu Sep 13 20:58:07 2007
@@ -23,12 +23,19 @@
build-stamp:
dh_testdir
+ # As this is a architecture independent package, we are not
+ # supposed to install stuff to /usr/lib. MakeMaker creates
+ # the dirs, we prevent this by setting the INSTALLVENDORARCH
+ # and VENDORARCHEXP environment variables.
+
# Add commands to compile the package here
- $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(PERL) Makefile.PL INSTALLDIRS=vendor \
+ INSTALLVENDORARCH=/usr/share/perl5/ \
+ VENDORARCHEXP=/usr/share/perl5/
$(MAKE)
#TEST#
- touch build-stamp
+ touch $@
clean:
dh_testdir
@@ -48,12 +55,7 @@
# Add commands to install the package into debian/$PACKAGE_NAME here
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
- # As this is a architecture independent package, we are not
- # supposed to install stuff to /usr/lib. MakeMaker creates
- # the dirs, we delete them from the deb:
- rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
-
- touch install-stamp
+ touch $@
binary-arch:
# We have nothing to do here for an architecture-independent package
Modified: trunk/dh-make-perl/rules.MakeMaker.xs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.MakeMaker.xs?rev=7563&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.xs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.xs Thu Sep 13 20:58:07 2007
@@ -32,12 +32,19 @@
build-stamp:
dh_testdir
+ # As this is a architecture dependent package, we are not
+ # supposed to install stuff to /usr/share. MakeMaker creates
+ # the dirs, we prevent this by setting the INSTALLVENDORARCH
+ # and VENDORARCHEXP environment variables.
+
# Add commands to compile the package here
- $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(PERL) Makefile.PL INSTALLDIRS=vendor \
+ INSTALLVENDORARCH=/usr/lib/perl5/ \
+ VENDORARCHEXP=/usr/lib/perl5/
$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
#TEST#
- touch build-stamp
+ touch $@
clean:
dh_testdir
@@ -57,12 +64,7 @@
# Add commands to install the package into debian/$PACKAGE_NAME here
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
- # As this is a architecture dependent package, we are not
- # supposed to install stuff to /usr/share. MakeMaker creates
- # the dirs, we delete them from the deb:
- rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5
-
- touch install-stamp
+ touch $@
# Build architecture-independent files here.
binary-indep: build install
More information about the Pkg-perl-cvs-commits
mailing list