From 0edb57f7d14c2916979f6d77f06ea82843703f90 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 1 Jul 2014 23:26:58 +0100 Subject: Two small fixes to make Debian builds work again. --- Makefile | 7 ++++--- debian/rules | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 26eeb2ad..13acf611 100644 --- a/Makefile +++ b/Makefile @@ -138,8 +138,9 @@ endif systemd: ifdef SYSTEMDSYSTEMUNITDIR - sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service - sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service + mkdir -p init + sed 's|@sbindir@|$(SBINDIR)|' $(_SRCDIR_)init/bitlbee.service.in > init/bitlbee.service + sed 's|@sbindir@|$(SBINDIR)|' $(_SRCDIR_)init/bitlbee@.service.in > init/bitlbee@.service endif install-systemd: @@ -148,7 +149,7 @@ ifeq ($(shell id -u),0) mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) $(INSTALL) -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) - $(INSTALL) -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) + $(INSTALL) -m 0644 $(_SRCDIR_)init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) else @echo Not root, so not installing systemd files. endif diff --git a/debian/rules b/debian/rules index 2c9e3a12..df977787 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ DEBUG ?= 0 ifndef BITLBEE_VERSION # Want to use the full package version number instead of just the release. -BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')\" +BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION="$(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')" endif ifneq ($(BITLBEE_LIBPURPLE),1) -- cgit v1.2.3