r12529 - in /trunk/libwwwbrowser-perl/debian: changelog rules
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Fri Jan 11 01:23:40 UTC 2008
Author: gregoa-guest
Date: Fri Jan 11 01:23:40 2008
New Revision: 12529
URL: http://svn.debian.org/wsvn/?sc=1&rev=12529
Log:
debian/rules:
- remove unneeded variables from perl Makefile.PL
- let install-stamp target depend on build-stamp
- remove /usr/bin and /usr/lib/perl5 if they exist
Modified:
trunk/libwwwbrowser-perl/debian/changelog
trunk/libwwwbrowser-perl/debian/rules
Modified: trunk/libwwwbrowser-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libwwwbrowser-perl/debian/changelog?rev=12529&op=diff
==============================================================================
--- trunk/libwwwbrowser-perl/debian/changelog (original)
+++ trunk/libwwwbrowser-perl/debian/changelog Fri Jan 11 01:23:40 2008
@@ -7,5 +7,9 @@
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
field (source stanza). Removed: XS-Vcs-Svn fields (source stanza).
* Set debhelper compatibility level to 6.
+ * debian/rules:
+ - remove unneeded variables from perl Makefile.PL
+ - let install-stamp target depend on build-stamp
+ - remove /usr/bin and /usr/lib/perl5 if they exist
- -- gregor herrmann <gregor+debian at comodo.priv.at> Fri, 11 Jan 2008 02:11:49 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Fri, 11 Jan 2008 02:18:53 +0100
Modified: trunk/libwwwbrowser-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libwwwbrowser-perl/debian/rules?rev=12529&op=diff
==============================================================================
--- trunk/libwwwbrowser-perl/debian/rules (original)
+++ trunk/libwwwbrowser-perl/debian/rules Fri Jan 11 01:23:40 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)
xvfb-run $(MAKE) test
@@ -46,8 +39,8 @@
# Add commands to clean up after the build process here
[ ! -f Makefile ] || $(MAKE) realclean
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
@@ -56,6 +49,11 @@
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
# anybrowser should be an example script
rm -f $(TMP)/usr/bin/anybrowser
+
+ # remove empty dirs if they exist
+ [ ! -d $(TMP)/usr/bin ] || rmdir --parents --ignore-fail-on-non-empty --verbose $(TMP)/usr/bin
+ [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --parents --ignore-fail-on-non-empty --verbose $(TMP)/usr/lib/perl5
+
touch $@
More information about the Pkg-perl-cvs-commits
mailing list