From 0406dc9bd6e515ee4ef48b4a882e28d5f0742a4c Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Sun, 10 Feb 2008 19:22:53 +0000
Subject: [PATCH] Export PATH to build environment
---
SConstruct | 4 +++-
debian/rules | 6 +-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/SConstruct b/SConstruct
index a190dcc22..51008c151 100644
--- a/SConstruct
+++ b/SConstruct
@@ -137,6 +137,7 @@ env.Append(
'LOGNAME' : logname, # needed by the debian build scripts
'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1",
'SCONS' : 1,
+ 'PATH' : os.environ.get('PATH')
},
LOCAL_CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ],
CONFIG_FILES_OPTS = configFilesOpts,
@@ -215,7 +216,8 @@ env.Clean('all', [ os.path.join(path,f)
PhonyTarget(env, 'deb', [
checkLocalConf,
updateRevision,
- "$BUILDPACKAGE_COMMAND -tc",
+ "$BUILDPACKAGE_COMMAND",
+ "fakeroot ./debian/rules debclean"
])
PhonyTarget(env, 'debsrc', [
diff --git a/debian/rules b/debian/rules
index b87c105a7..8f1cefcb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,15 +19,11 @@ export debian_build
# This has to be exported to make some magic below work.
export DH_OPTIONS
-#DPKG_ARCH#
-
CFLAGS = -Wall -g
CONCURRENCY_LEVEL ?= 1
export CONCURRENCY_LEVEL
-LIBTYPE ?= UNSPEC
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -39,7 +35,7 @@ destdir=$(CURDIR)/debian/tmp
configure: configure-stamp
configure-stamp:
dh_testdir
-# # Add here commands to configure the package.
+# Add here commands to configure the package.
rm -f Doxyfile.local SConfig local_config.hh
scons prepare
# If needed, we could create new files 'Doxyfile.local',
--
GitLab