From f6252841133bd9b53d930cd239cfe0ba23c92cdf Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 17 May 2019 21:19:46 +0900 Subject: [PATCH] dist/debian: apply product name variable on override_dh_auto_install To make product name templatization works correctly, we cannot use "debian/scylla-server" as package contents directory path, need to use template like "debian/{{product}}-server" instead. Signed-off-by: Takuya ASADA Message-Id: <20190517121946.18248-1-syuu@scylladb.com> --- dist/debian/rules.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/debian/rules.mustache b/dist/debian/rules.mustache index 4f109c7902..f2097c21ac 100755 --- a/dist/debian/rules.mustache +++ b/dist/debian/rules.mustache @@ -11,10 +11,10 @@ override_dh_auto_clean: override_dh_auto_install: dh_auto_install - install -d $(CURDIR)/debian/scylla-server/usr/bin - ln -sf /opt/scylladb/bin/scylla $(CURDIR)/debian/scylla-server/usr/bin/scylla - ln -sf /opt/scylladb/bin/iotune $(CURDIR)/debian/scylla-server/usr/bin/iotune - ln -sf /usr/lib/scylla/scyllatop/scyllatop.py $(CURDIR)/debian/scylla-server/usr/bin/scyllatop + install -d $(CURDIR)/debian/{{product}}-server/usr/bin + ln -sf /opt/scylladb/bin/scylla $(CURDIR)/debian/{{product}}-server/usr/bin/scylla + ln -sf /opt/scylladb/bin/iotune $(CURDIR)/debian/{{product}}-server/usr/bin/iotune + ln -sf /usr/lib/scylla/scyllatop/scyllatop.py $(CURDIR)/debian/{{product}}-server/usr/bin/scyllatop override_dh_installinit: {{#scylla}}