[Build-common-hackers] Bug#254125: cdbs: DESTDIR should end with /

[Martin Quinson]

This is a multi-part MIME message sent by reportbug.

--===============1008279216==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

[sorry I'm offline, I cannot check whether that's a known bug or not,
and I fear to forget if I delay the report]

Hello,

the DESTDIR variable is most often used in constructions like
$(DESTDIR)$(path). I ran into a case where path was a relative one. In
that case, there is no separating / anymore, breaking the concatenation.

You may well argue that the bug is to use a relative patch at the first
place, and you'd be right, but having two slashes in the regular case
shouldn't harm anything, and the patch is so simple...

Thanks for applying, Mt.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.3
Locale: LANG=fr_FR@euro, LC_CTYPE=fr_FR@euro

-- no debconf information

--===============1008279216==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff-cdbs-destdir"

--- /usr/share/cdbs/1/rules/buildvars.mk~	2004-02-22 19:41:26.000000000 -0800
+++ /usr/share/cdbs/1/rules/buildvars.mk	2004-06-12 01:12:02.000000000 -0700
@@ -71,9 +71,9 @@
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifeq ($(words $(DEB_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_PACKAGES))
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_PACKAGES))/
 else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
 endif
 
 endif

--===============1008279216==--