From 3ae0ff6424b515491ab698baa946b33947fac188 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 15 May 2014 12:36:00 +0200 Subject: [PATCH] provide default to WITH_INIT and WITH_SYSTEMD right in the makefile --- Makefile | 12 ++++++++++-- debian/rules | 3 +-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0bea07a..78e93b7 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,18 @@ # autoconf compatible variables datadir := /usr/share bindir := /usr/bin -# call with either WITH_SYSTEMD=true or WITH_INIT=true initdir=/etc/rc.d/init.d systemddir := /usr/lib/systemd/system +# call with either WITH_SYSTEMD=true or WITH_INIT=true +# otherwise we try to guess some reasonable default +ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" "" +ifeq "$(wildcard $systemddir/*)" "" +WITH_INIT=true +else +WITH_SYSTEMD=true +endif +endif #################### all: forward_api_calls python setup.py build @@ -80,7 +88,7 @@ DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2 DATE=$(shell date -u +"%a, %d %b %Y %T") force: -debian: debian/changelog debian.source debian.package +debian: forward_api_calls install debian/changelog debian.source debian.package debian/changelog: debian/changelog.in sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog diff --git a/debian/rules b/debian/rules index 5df3ce4..9d11d00 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -DEB_PYTHON_SETUP_CMD = setup-lib.py - %: dh $@ --with python2 --buildsystem=python_distutils + -- 2.43.0