Fix destdir handling for multiple binary packages in DEB_TRANSFORM_FILES.

git-svn-id: svn+ssh://svn.mit.edu/athena/trunk/debathena/debathena/config-package-dev@23196 728af825-273c-0410-89f9-f7d3b574a069

diff --git a/debian/changelog b/debian/changelog
index 0444fcef085812a7beed281e02312ea5abfebe6f..5c5d2c24f3b194cb6aa2ab7877fad9c1c836a271 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+config-package-dev (4.9) unstable; urgency=low
+
+  * Fix destdir handling for multiple binary packages in
+    DEB_TRANSFORM_FILES.
+
+ -- Tim Abbott <tabbott@mit.edu>  Fri,  3 Oct 2008 23:43:49 -0400
+
 config-package-dev (4.8) unstable; urgency=low
 
   * Add additional documentation to the makefile fragments

diff --git a/divert.mk b/divert.mk
index 483c9a944c99d23836d1e8ce4d406e5a4fdf6970..e387dcef232fce85b31cc868f9deff7604119ff1 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -85,7 +85,7 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
                $(foreach file,$(divert_files), \
                    echo "    divert_link $(call divert_files_replace_name,$(file), )";) \
                $(foreach file,$(divert_remove_files), \
-                   mkdir -p $(DEB_DESTDIR)/usr/share/$(cdbs_curpkg); \
+                   mkdir -p debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg); \
                    echo "    divert_remove $(file) /usr/share/$(cdbs_curpkg)/`$(DEB_DIVERT_ENCODER) $(file)`";) \
                echo 'fi'; \
            ) \

diff --git a/transform-files.mk b/transform-files.mk
index d0de55a99a924449d8d0342097dc219873b04653..b8c9a9d518b9c32ad78ef52b346e8a66143d5299 100644 (file)
--- a/transform-files.mk
+++ b/transform-files.mk
@@ -42,9 +42,9 @@ $(call debian_transform_files,%): $(call debian_check_files,%)
 
 $(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
        $(foreach file,$(DEB_TRANSFORM_FILES_$(cdbs_curpkg)), \
-               install -d $(DEB_DESTDIR)/$(dir $(file)); \
+               install -d debian/$(cdbs_curpkg)/$(dir $(file)); \
                cp -a $(call debian_transform_files,$(file)) \
-                   $(DEB_DESTDIR)/$(dir $(file));)
+                   debian/$(cdbs_curpkg)/$(dir $(file));)
 
 clean::
        rm -rf $(DEB_TRANSFORM_FILES_TMPDIR)