r17731 - in /trunk/dh-make-perl: debian/changelog rules.MakeMaker.noxs rules.MakeMaker.xs rules.Module-Build.noxs rules.Module-Build.xs
tincho-guest at users.alioth.debian.org
tincho-guest at users.alioth.debian.org
Mon Mar 17 04:00:46 UTC 2008
Author: tincho-guest
Date: Mon Mar 17 04:00:45 2008
New Revision: 17731
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17731
Log:
* rules.* templates: Make source and diff .PHONY targets too, prettify a
little: remove unneeded whitespace, make PERL a conditional assignment
instead of an "#if" block, align the assignment of the variables.
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/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=17731&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Mon Mar 17 04:00:45 2008
@@ -21,7 +21,9 @@
* dh-make-perl: when storing versioned dependencies, remove any leading 'v'
[ MartÃn Ferrari ]
- * Make source and diff .PHONY targets too.
+ * rules.* templates: Make source and diff .PHONY targets too, prettify a
+ little: remove unneeded whitespace, make PERL a conditional assignment
+ instead of an "#if" block, align the assignment of the variables.
-- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 09 Mar 2008 22:00:23 +0100
Modified: trunk/dh-make-perl/rules.MakeMaker.noxs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/rules.MakeMaker.noxs?rev=17731&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.noxs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.noxs Mon Mar 17 04:00:45 2008
@@ -11,31 +11,23 @@
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
build-stamp:
dh_testdir
-
# Add commands to compile the package here
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
#TEST#
-
touch $@
clean:
dh_testdir
dh_testroot
-
dh_clean build-stamp install-stamp
-
# Add commands to clean up after the build process here
[ ! -f Makefile ] || $(MAKE) realclean
@@ -44,12 +36,11 @@
dh_testdir
dh_testroot
dh_clean -k
-
# 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
-
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
touch $@
binary-arch:
Modified: trunk/dh-make-perl/rules.MakeMaker.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/rules.MakeMaker.xs?rev=17731&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.xs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.xs Mon Mar 17 04:00:45 2008
@@ -11,13 +11,9 @@
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
# Allow disabling build optimisation by setting noopt in
# $DEB_BUILD_OPTIONS
@@ -31,20 +27,16 @@
build: build-stamp
build-stamp:
dh_testdir
-
# Add commands to compile the package here
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
#TEST#
-
touch $@
clean:
dh_testdir
dh_testroot
-
dh_clean build-stamp install-stamp
-
# Add commands to clean up after the build process here
[ ! -f Makefile ] || $(MAKE) realclean
@@ -53,12 +45,11 @@
dh_testdir
dh_testroot
dh_clean -k
-
# 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
-
+ [ ! -d $(TMP)/usr/share/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/share/perl5
touch $@
# Build architecture-independent files here.
Modified: trunk/dh-make-perl/rules.Module-Build.noxs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/rules.Module-Build.noxs?rev=17731&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.Module-Build.noxs (original)
+++ trunk/dh-make-perl/rules.Module-Build.noxs Mon Mar 17 04:00:45 2008
@@ -14,31 +14,23 @@
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
build-stamp:
dh_testdir
-
# Add commands to compile the package here
$(PERL) Build.PL installdirs=vendor
$(PERL) Build
#TEST#
-
touch $@
clean:
dh_testdir
dh_testroot
-
dh_clean build-stamp install-stamp
-
# Add commands to clean up after the build process here
[ ! -f Build ] || $(PERL) Build distclean
@@ -47,10 +39,8 @@
dh_testdir
dh_testroot
dh_clean -k
-
# Add commands to install the package into $(TMP) here
$(PERL) Build install destdir=$(TMP) create_packlist=0
-
touch $@
binary-arch:
Modified: trunk/dh-make-perl/rules.Module-Build.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/rules.Module-Build.xs?rev=17731&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.Module-Build.xs (original)
+++ trunk/dh-make-perl/rules.Module-Build.xs Mon Mar 17 04:00:45 2008
@@ -11,13 +11,9 @@
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
# Allow disabling build optimisation by setting noopt in
# $DEB_BUILD_OPTIONS
@@ -31,20 +27,16 @@
build: build-stamp
build-stamp:
dh_testdir
-
# Add commands to compile the package here
$(PERL) Build.PL installdirs=vendor
OPTIMIZE="$(CFLAGS)" $(PERL) Build
#TEST#
-
touch $@
clean:
dh_testdir
dh_testroot
-
dh_clean build-stamp install-stamp
-
# Add commands to clean up after the build process here
[ ! -f Build ] || $(PERL) Build distclean
@@ -53,10 +45,8 @@
dh_testdir
dh_testroot
dh_clean -k
-
# Add commands to install the package into $(TMP) here
$(PERL) Build install destdir=$(TMP) create_packlist=0
-
touch $@
# Build architecture-independent files here.
More information about the Pkg-perl-cvs-commits
mailing list