Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing...

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 26361bb182d37486592582f5265a3726888e5bf3..ab58fc580cc53e7d11dadb020c51b202218a9712 100644 (file)
--- 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 \