diff options
| author | Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> | 2010-01-12 11:19:35 +0200 |
|---|---|---|
| committer | Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> | 2010-01-12 11:19:35 +0200 |
| commit | 077591956421306741b83fd4401f711b0f4f5925 (patch) | |
| tree | d5c59c8fc10e39285270de1361e8a47a1b9126be | |
| parent | 8e7997e9e28cfecb73c1035aa3a55f5fbe4c1330 (diff) | |
Reverted sb 1 sanitization as it prevents integration
| -rwxr-xr-x | debian/rules | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/debian/rules b/debian/rules index 581b6e4f..71da7bd8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,25 +3,9 @@ #export DH_VERBOSE=1 -# Sanitize build environment when running inside Scratchbox 1 -ifneq (,$(wildcard /targets)) - export SBOX_REDIRECT_TO_DIRS= - export PATH=/scratchbox/compilers/bin:/bin:/usr/bin:/scratchbox/tools/bin - rc:=$(shell debian/fixup-scratchbox >&2) - ifneq (,$(FAKEROOTKEY)) - ifneq (/usr/lib/libfakeroot/libfakeroot-sysv.so,$(LD_PRELOAD)) - export FAKEROOTKEY=$(shell /usr/bin/faked-sysv | cut -d: -f1) - export LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-sysv.so - endif - endif -endif - LDFLAGS+=-Wl,--as-needed -configure: - ./autogen.sh --no-configure - -Makefile: configure +Makefile: ./configure --prefix /usr --sysconfdir=/etc --disable-coverage build: build-stamp @@ -30,11 +14,11 @@ build-stamp: Makefile $(MAKE) LDFLAGS='$(LDFLAGS)' all touch build-stamp -clean: +clean: Makefile dh_testdir dh_testroot rm -f build-stamp - [ -f Makefile ] && $(MAKE) distclean || true + $(MAKE) distclean dh_clean install: |