=== modified file 'debian/rules' --- debian/rules 2009-12-11 13:47:09 +0000 +++ debian/rules 2010-01-05 19:05:33 +0000 @@ -15,6 +15,7 @@ DEBIAN_XUL_DIR = /usr/lib/xulrunner-$(DEBIAN_XUL_VER) DEBIAN_XUL_INCLUDE_DIR = /usr/include/xulrunner-$(DEBIAN_XUL_VER) DEB_SRCDIR := mozilla +DEB_BUILDDIR := build-tree DEB_LSB_CODENAME := $(shell lsb_release -c -s) @@ -227,8 +228,11 @@ sed -i 's/Cflags:\(.*\)$$/Cflags:\1 -I$${includedir}\/stable\/nspr/' $$i; \ done +TEST_TOOLS = \ + tools/test-harness \ + $(NULL) + TEST_RESULTS = \ - tools/test-harness \ _leaktest \ _profile \ _tests \ @@ -236,7 +240,9 @@ test-results: debian/test-results-stamp debian/test-results-stamp: - ( cd $(DEB_BUILDDIR) ; tar zcvfh $(CURDIR)/debian/test-results.tar.gz $(TEST_RESULTS) ) + ( cd $(DEB_BUILDDIR) ; tar cvfh $(CURDIR)/debian/test-results.tar $(TEST_RESULTS) ) + ( cd $(DEB_SRCDIR) ; tar rvfh $(CURDIR)/debian/test-results.tar $(TEST_TOOLS) ) + gzip -f $(CURDIR)/debian/test-results.tar touch $@ FIND_EXP = $(foreach ext,$(NOT_EXECUTABLE),-name '$(ext)' -o) @@ -274,7 +280,7 @@ %: %.pp # Pre-processing $@ - perl $(DEB_BUILDDIR)/config/preprocessor.pl $< > $@ + perl $(DEB_SRCDIR)/config/preprocessor.pl $< > $@ %: %.in sed -e 's,@XULDIR@,$(DEBIAN_XUL_DIR),g' \