[23555] in Source-Commits
/svn/athena r23196 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sat Oct 4 00:11:28 2008
Date: Sat, 4 Oct 2008 00:10:54 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200810040410.AAA29740@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-10-04 00:10:53 -0400 (Sat, 04 Oct 2008)
New Revision: 23196
Modified:
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/divert.mk
trunk/debathena/debathena/config-package-dev/transform-files.mk
Log:
In config-package-dev:
* Fix destdir handling for multiple binary packages in
DEB_TRANSFORM_FILES.
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2008-10-04 02:13:53 UTC (rev 23195)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2008-10-04 04:10:53 UTC (rev 23196)
@@ -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
Modified: trunk/debathena/debathena/config-package-dev/divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.mk 2008-10-04 02:13:53 UTC (rev 23195)
+++ trunk/debathena/debathena/config-package-dev/divert.mk 2008-10-04 04:10:53 UTC (rev 23196)
@@ -85,7 +85,7 @@
$(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'; \
) \
Modified: trunk/debathena/debathena/config-package-dev/transform-files.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/transform-files.mk 2008-10-04 02:13:53 UTC (rev 23195)
+++ trunk/debathena/debathena/config-package-dev/transform-files.mk 2008-10-04 04:10:53 UTC (rev 23196)
@@ -42,9 +42,9 @@
$(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)
