From 0d70314eadad1e28d7dc88c6de11c0557a35b4cb Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 28 Mar 2018 05:17:23 -0700 Subject: [PATCH] Fix package make with ninja (#2129) * Fix package make with ninja --- debian/rules | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 4cef8702e05..1cb7de10224 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie # because copy_headers.sh have hardcoded path to build/include_directories.txt BUILDDIR = build -DESTDIR = debian/tmp +CURDIR = $(shell pwd) +DESTDIR = $(CURDIR)/debian/tmp DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -94,12 +95,15 @@ override_dh_install: CLANG=$(DESTDIR)/usr/bin/clickhouse-clang ./copy_headers.sh . $(DESTDIR)/usr/share/clickhouse/headers # fake metrika files when private dir is empty - mkdir -p debian/tmp/etc/clickhouse-server/metrika - touch debian/tmp/etc/clickhouse-server/metrika/config.xml - touch debian/tmp/etc/clickhouse-server/metrika/users.xml + mkdir -p $(DESTDIR)/etc/clickhouse-server/metrika + touch $(DESTDIR)/etc/clickhouse-server/metrika/config.xml + touch $(DESTDIR)/etc/clickhouse-server/metrika/users.xml dh_install --list-missing --sourcedir=$(DESTDIR) +override_dh_auto_install: + env DESTDIR=$(DESTDIR) ninja -C $(BUILDDIR) install + override_dh_shlibdeps: true # We depend only on libc and dh_shlibdeps gives us wrong (too strict) dependency.