From a97127c3d019ee073c078dbb652a12386f58515b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 May 2016 08:27:58 +0200 Subject: remove semi-support for different build-dirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The debian/rules file tries to guess in which directory it is supposed to be building, but that guess is always ./build – if it wasn't it would fail later as not all rules take alternatives into acount. So, as this is clearly not used lets remove this complexity instead of fixing it up. Git-Dch: Ignore --- debian/rules | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9c7f456e3..bdc539fef 100755 --- a/debian/rules +++ b/debian/rules @@ -42,23 +42,9 @@ endif # Default rule build: -PKG=apt -DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) - # Determine the build directory to use -BASE=. -ifdef BUILD -BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD) -else -BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname --machine) $(BASE)/build -endif -BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*)) -BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX)))) -override BLD := $(BUILDX) - -ifeq ($(words $(BLD)),0) -override BLD := ./build -endif +override BASE := . +override BLD := $(BASE)/build # When building without , the header is available and thus the test is # successful. When building with , the header is missing, but we still -- cgit v1.2.3