r12432 - in /trunk/dh-make-perl: debian/changelog rules.MakeMaker.noxs rules.MakeMaker.xs rules.Module-Build.noxs rules.Module-Build.xs
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Thu Jan 10 14:57:43 UTC 2008
Author: dmn
Date: Thu Jan 10 14:57:43 2008
New Revision: 12432
URL: http://svn.debian.org/wsvn/?sc=1&rev=12432
Log:
* all templates: use $(TMP) in the comment before the install
* MakeMaker templates: do not set INSTALLVENDORARCH and VENDORARCHEXP when
configuring. Instead, verbosely remove the empty dirs if they exist. Perl
5.10's MakeMaker is reported to be fixed.
Modified:
trunk/dh-make-perl/debian/changelog
trunk/dh-make-perl/rules.MakeMaker.noxs
trunk/dh-make-perl/rules.MakeMaker.xs
trunk/dh-make-perl/rules.Module-Build.noxs
trunk/dh-make-perl/rules.Module-Build.xs
Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/debian/changelog?rev=12432&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Jan 10 14:57:43 2008
@@ -1,6 +1,13 @@
dh-make-perl (0.38) UNRELEASED; urgency=low
+ [ gregor herrmann ]
* Fix inline documentation: it's Vcs-Svn and Vcs-Browser nowadays.
+
+ [ Damyan Ivanov ]
+ * all templates: use $(TMP) in the comment before the install
+ * MakeMaker templates: do not set INSTALLVENDORARCH and VENDORARCHEXP when
+ configuring. Instead, verbosely remove the empty dirs if they exist. Perl
+ 5.10's MakeMaker is reported to be fixed.
-- gregor herrmann <gregor+debian at comodo.priv.at> Thu, 03 Jan 2008 03:30:54 +0100
Modified: trunk/dh-make-perl/rules.MakeMaker.noxs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.MakeMaker.noxs?rev=12432&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.noxs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.noxs Thu Jan 10 14:57:43 2008
@@ -23,15 +23,8 @@
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 \
- INSTALLVENDORARCH=/usr/share/perl5/ \
- VENDORARCHEXP=/usr/share/perl5/
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
#TEST#
@@ -52,8 +45,10 @@
dh_testroot
dh_clean -k
- # Add commands to install the package into debian/$PACKAGE_NAME here
+ # Add commands to install the package into $(TMP) here
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+
+ [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
touch $@
Modified: trunk/dh-make-perl/rules.MakeMaker.xs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.MakeMaker.xs?rev=12432&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.xs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.xs Thu Jan 10 14:57:43 2008
@@ -32,15 +32,8 @@
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 \
- INSTALLVENDORARCH=/usr/lib/perl5/ \
- VENDORARCHEXP=/usr/lib/perl5/
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
#TEST#
@@ -61,8 +54,10 @@
dh_testroot
dh_clean -k
- # Add commands to install the package into debian/$PACKAGE_NAME here
+ # Add commands to install the package into $(TMP)
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+
+ [ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
touch $@
Modified: trunk/dh-make-perl/rules.Module-Build.noxs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.Module-Build.noxs?rev=12432&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.Module-Build.noxs (original)
+++ trunk/dh-make-perl/rules.Module-Build.noxs Thu Jan 10 14:57:43 2008
@@ -48,7 +48,7 @@
dh_testroot
dh_clean -k
- # Add commands to install the package into debian/$PACKAGE_NAME here
+ # Add commands to install the package into $(TMP) here
$(PERL) Build install destdir=$(TMP) create_packlist=0
touch $@
Modified: trunk/dh-make-perl/rules.Module-Build.xs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.Module-Build.xs?rev=12432&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.Module-Build.xs (original)
+++ trunk/dh-make-perl/rules.Module-Build.xs Thu Jan 10 14:57:43 2008
@@ -54,7 +54,7 @@
dh_testroot
dh_clean -k
- # Add commands to install the package into debian/$PACKAGE_NAME here
+ # Add commands to install the package into $(TMP) here
$(PERL) Build install destdir=$(TMP) create_packlist=0
touch $@
More information about the Pkg-perl-cvs-commits
mailing list