From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 1 Nov 2021 19:49:21 +0000 (-0400)
Subject: --config-files goes to APP_NAME so that multiple packages don't conflict
X-Git-Tag: 2.4.0~33
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/ad17f8efd3c26dda57264156cfc9a80c51c3a639

--config-files goes to APP_NAME so that multiple packages don't conflict

no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/Makefile b/Makefile
index 26361bb1..ab58fc58 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,9 @@ $(DEB_FILE): build
 	 --url="https://arvados.org" \
 	 --license="GNU Affero General Public License, version 3.0" \
 	 --description="$(DESCRIPTION)" \
-	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
-	$(WORKSPACE)/build/=$(DEST_DIR)
+	 --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
+	$(WORKSPACE)/build/=$(DEST_DIR) \
+	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 $(RPM_FILE): build
 	fpm \
@@ -112,8 +113,9 @@ $(RPM_FILE): build
 	 --url="https://arvados.org" \
 	 --license="GNU Affero General Public License, version 3.0" \
 	 --description="$(DESCRIPTION)" \
-	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
-	 $(WORKSPACE)/build/=$(DEST_DIR)
+	 --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
+	 $(WORKSPACE)/build/=$(DEST_DIR) \
+	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 copy: $(DEB_FILE) $(RPM_FILE)
 	for target in $(TARGETS) ; do \