Revert debuild -ePATH change; debuild is broken anyway

Author: mdz
Date: 2003-12-21 00:28:15 GMT
Revert debuild -ePATH change; debuild is broken anyway

diff --git a/debian/changelog b/debian/changelog
index b2617da..44a039e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,6 @@ 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 -ePATH to debuild; clobbering PATH defeats the usual method of
-    using ccache, and apt takes a long time to compile
 
  -- Matt Zimmerman <mdz@debian.org>  Sat, 20 Dec 2003 16:22:41 -0800
 

diff --git a/debian/rules b/debian/rules
index 504120f..c2c41e8 100755 (executable)
--- 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.58 2003/12/21 00:23:57 mdz Exp $
+# $Id: rules,v 1.59 2003/12/21 00:28:15 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 -us -uc -ePATH
+DEB_BUILD_PROG:=debuild -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)