[Build-common-hackers] Bug#205361: cdbs: perl modules should install into DEB_DESTDIR

[Dagfinn Ilmari Mannsaker]

Package: cdbs
Version: 0.4.5.2
Severity: normal
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The DEB_MAKEMAKER_PACKAGE variable is useless (and its setting in
perlmodule.mk doesn't work, ?= only sets if it's undefined, not if it's
empty). Also, the setting of it in perlmodule-vars.mk is broken, since
'list-pacakges same' doesn't return arch-all packages.

Instead, perl modules should be installed into DEB_DESTDIR and
debian/package.install should take care of putting it in the right
package for multi-binary packages.

This patch removes DEB_MAKEMAKER_PACKAGE and uses
$(DEB_DESTDIR)/usr for PREFIX in DEB_MAKE_INSTALL_TARGET.

- --- perlmodule.mk.orig	2003-08-09 06:10:25.000000000 +0200
+++ perlmodule.mk	2003-08-09 06:03:01.000000000 +0200
@@ -32,8 +32,6 @@
 
 include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
 
- -DEB_MAKEMAKER_PACKAGE ?= tmp
- -
 ifneq ($(DEB_BUILDDIR),$(DEB_SRCDIR))
 $(error DEB_BUILDDIR and DEB_SRCDIR must be the same for Perl builds.)
 endif
- --- perlmodule-vars.mk.orig	2003-08-09 05:56:08.000000000 +0200
+++ perlmodule-vars.mk	2003-08-09 06:03:49.000000000 +0200
@@ -33,16 +33,12 @@
 # Override optimizations to follow Perl Policy 3.3
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) OPTIMIZE="$(CFLAGS)"
 
- -# If there are more than one package, simply install into the first one.
- -# Unset to install into debian/tmp instead.
- -DEB_MAKEMAKER_PACKAGE := $(strip $(shell $(_cdbs_scripts_path)/list-packages same))
- -
 DEB_MAKEMAKER_INVOKE = /usr/bin/perl Makefile.PL INSTALLDIRS=vendor
 
 # Set some MakeMaker defaults
 DEB_MAKE_BUILD_TARGET = all
 DEB_MAKE_CLEAN_TARGET = distclean
 DEB_MAKE_CHECK_TARGET = test
- -DEB_MAKE_INSTALL_TARGET = install PREFIX=$(CURDIR)/debian/$(DEB_MAKEMAKER_PACKAGE)/usr
+DEB_MAKE_INSTALL_TARGET = install PREFIX=$(DEB_DESTDIR)/usr
 
 endif


- -- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux galadriel 2.4.21-4-686 #1 Sat Aug 2 23:27:25 EST 2003 i686
Locale: LANG=en_US, LC_CTYPE=no_NO.ISO-8859-1

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)

iD8DBQE/O0itVcejModakHQRArxvAJ9deYIf1+He7D95/llVxkY5y4RFAQCgyET/
jRjbt6P9ZSsR7ZkzEp2ApOw=
=PI7y
-----END PGP SIGNATURE-----