summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:04:21 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:04:21 +0000
commit275e1a268bfbf686b863e24951ac36d287490576 (patch)
tree77bd0a8d942baaff219bc3711908cb90ff32f7dc
parentd7d2fc3616ae78e0aede1e9cc98849989fafc2e9 (diff)
Preserve CCACHE_DIR also
Author: mdz Date: 2003-12-21 00:37:58 GMT Preserve CCACHE_DIR also
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules4
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 518431e31..e683db439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,8 @@ apt (0.5.15) unstable; urgency=low
* Clarify documentation of --no-upgrade in apt-get(8) (Closes: #219743)
* Clean up and simplify some of the suggests/recommends display in apt-get
* Use cvs update -d in debian/rules cvs-build rather than just update
- * Pass --preserve-envvar PATH to debuild. apt takes a long time to
- build, and this defeats ccache
+ * Pass --preserve-envvar PATH --preserve-envvar CCACHE_DIR to debuild. apt
+ takes a long time to build, and ccache helps
-- Matt Zimmerman <mdz@debian.org> Sat, 20 Dec 2003 16:34:30 -0800
diff --git a/debian/rules b/debian/rules
index c472b8f79..dd2c993ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Made with the aid of dh_make, by Craig Small
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.60 2003/12/21 00:34:40 mdz Exp $
+# $Id: rules,v 1.61 2003/12/21 00:37:58 mdz Exp $
# LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
# dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -30,7 +30,7 @@ endif
# Default rule
build:
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH -us -uc
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc
APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)