From e1bb3705309ab7ad3326ec4065c31f4cb107c838 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 11 Oct 2017 04:03:30 +0000 Subject: =?UTF-8?q?debian/rules:=20Use=20more=20lazy=20(:=3D=20=E2=86=92?= =?UTF-8?q?=20=3D)=20assignments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/rules | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/debian/rules b/debian/rules index 0098988..180a638 100755 --- a/debian/rules +++ b/debian/rules @@ -17,23 +17,23 @@ include /usr/share/dpkg/default.mk # Note: the Build-Depends line in debian/control must be kept in sync # with DISABLE_JAVAHL_ARCHS. -ENABLE_JAVAHL := yes -DISABLE_JAVAHL_ARCHS := hurd-i386 hppa sparc +ENABLE_JAVAHL = yes +DISABLE_JAVAHL_ARCHS = hurd-i386 hppa sparc ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_JAVAHL_ARCHS))) - ENABLE_JAVAHL := + ENABLE_JAVAHL = endif # We may need to disable libapache2-mod-svn and/or libsvn-ruby*. -ENABLE_APACHE := yes -ENABLE_RUBY := yes +ENABLE_APACHE = yes +ENABLE_RUBY = yes -DEB_BUILDDIR := BUILD -MAKE_B := $(MAKE) -C $(DEB_BUILDDIR) -AUTH_LIB_DIRS := $(DEB_BUILDDIR)/subversion/libsvn_auth_gnome_keyring/.libs:$(DEB_BUILDDIR)/subversion/libsvn_auth_kwallet/.libs -BASH_COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion) +DEB_BUILDDIR = BUILD +MAKE_B = $(MAKE) -C $(DEB_BUILDDIR) +AUTH_LIB_DIRS = $(DEB_BUILDDIR)/subversion/libsvn_auth_gnome_keyring/.libs:$(DEB_BUILDDIR)/subversion/libsvn_auth_kwallet/.libs +BASH_COMPL_DIR = $(shell pkg-config --variable=completionsdir bash-completion) -export LANG := C -export HOME := $(DEB_BUILDDIR)/dummy_home +export LANG = C +export HOME = $(DEB_BUILDDIR)/dummy_home # ENABLE_FOO -> DEB_OPT_WITH_FOO=1 # DEB_BUILD_OPTIONS='foo bar' -> DEB_OPT_FOO=1, DEB_OPT_BAR=1 @@ -53,10 +53,10 @@ fix_shebangs_in = \ -e 's:^\#! */usr/bin/env pyth.*:\#!/usr/bin/python:' \ -e 's:^\#! */usr/bin/env ruby.*:\#!/usr/bin/$(RUBY):' -PERL_VENDORARCH := $(shell perl -MConfig -e 'print $$Config{vendorarch}') -PERL_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/perl/native -PY_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/python -PYVERSIONS := $(shell pyversions -vi) +PERL_VENDORARCH = $(shell perl -MConfig -e 'print $$Config{vendorarch}') +PERL_DIR = $(DEB_BUILDDIR)/subversion/bindings/swig/perl/native +PY_DIR = $(DEB_BUILDDIR)/subversion/bindings/swig/python +PYVERSIONS = $(shell pyversions -vi) allpy = \ set -e; for v in $(PYVERSIONS); do \ @@ -67,11 +67,11 @@ allpy = \ $1; \ done -libdir := /usr/lib/$(DEB_HOST_MULTIARCH) +libdir = /usr/lib/$(DEB_HOST_MULTIARCH) # ~max(min required sqlite, stable's sqlite) -MIN_SQLITE_VER := 3.8.7 +MIN_SQLITE_VER = 3.8.7 -confflags := \ +confflags = \ --prefix=/usr \ --libdir=$(libdir) \ --mandir=\$${prefix}/share/man \ @@ -114,13 +114,13 @@ else endif ifdef DEB_OPT_WITH_RUBY - RUBY := ruby - RUBY_ARCH_DIR := $(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendorarchdir']") - rb_defs := SWIG_RB_SITE_LIB_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendordir']") + RUBY = ruby + RUBY_ARCH_DIR = $(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendorarchdir']") + rb_defs = SWIG_RB_SITE_LIB_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendordir']") rb_defs += SWIG_RB_SITE_ARCH_DIR=$(RUBY_ARCH_DIR) else DH_OPTIONS += -Nruby-svn - RUBY := fooby + RUBY = fooby endif @@ -130,7 +130,7 @@ ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) - DEB_OPT_NOCHECK := 1 + DEB_OPT_NOCHECK = 1 endif @@ -177,9 +177,9 @@ debian/stamp-configure: debian/stamp-autogen build: debian/stamp-build-arch debian/stamp-build-indep -check_defs := CLEANUP=1 LC_ALL=C -check_swig := check-swig-py check-swig-pl $(if $(DEB_OPT_WITH_RUBY),check-swig-rb) -check_all := $(check_swig) $(if $(DEB_OPT_WITH_JAVAHL),check-javahl) check +check_defs = CLEANUP=1 LC_ALL=C +check_swig = check-swig-py check-swig-pl $(if $(DEB_OPT_WITH_RUBY),check-swig-rb) +check_all = $(check_swig) $(if $(DEB_OPT_WITH_JAVAHL),check-javahl) check check-help: @echo "$(MAKE) $(check_all)" -- cgit v1.2.3