From e9f22c8d26f2ff7b66e2a931d9fb903e929e0177 Mon Sep 17 00:00:00 2001 From: Fabien Tassin Date: Sat, 20 Sep 2008 01:25:52 +0200 Subject: * [ compare ] search for $(DEB_BUILDDIR)/mozilla/dist/bin, needed by mozilla packages using MOZ_OBJDIR - update src/compare.mk.in --- debian/changelog | 6 +++++- src/compare.mk.in | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 57b4aa4..657ce37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,12 @@ mozilla-devscripts (0.11) UNRELEASED; urgency=low - move thunderbird-3.0 from cvs to hg comm-central - update src/mozclient/thunderbird-3.0.conf - add src/mozclient/thunderbird-3.0-remove.binonly.sh + * [ compare ] + search for $(DEB_BUILDDIR)/mozilla/dist/bin, needed + by mozilla packages using MOZ_OBJDIR + - update src/compare.mk.in - -- Fabien Tassin Fri, 19 Sep 2008 18:31:05 +0200 + -- Fabien Tassin Sat, 20 Sep 2008 01:21:36 +0200 mozilla-devscripts (0.10) intrepid; urgency=low diff --git a/src/compare.mk.in b/src/compare.mk.in index 8cba960..12abcf0 100644 --- a/src/compare.mk.in +++ b/src/compare.mk.in @@ -54,6 +54,10 @@ compare: find build-tree/dist/bin \! -type d | cut -d/ -f4- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \ elif [ -d dist ] ; then \ find dist/bin \! -type d | cut -d/ -f3- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \ + elif [ -d $(DEB_BUILDDIR)/mozilla/dist ] ; then \ + find $(DEB_BUILDDIR)/mozilla/dist/bin \! -type d | cut -d/ -f5- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \ + else \ + echo "Error: Can't find any suitable dist/bin directory" ; \ fi ; \ find debian/tmp -type f | cut -d/ -f3- | $(COMPARE_FILTER_PRE_OUT) | sort > $(LIST_INSTALLED) ; \ echo "## Compare the content of dist/bin and debian/tmp..." ; \ -- cgit v1.2.1