Merge branch 'master' into 13797-refactoring

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index a543d4649364f0b1a5e87abf02ad39b8dce45e29..c28b4b86c360b0e4200af5f5eb6ef0513983da7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# Use bash, and run all lines in each recipe as one shell command
+SHELL := /bin/bash
+.ONESHELL:
+
 APP_NAME?=arvados-workbench2
 
 # GIT_TAG is the last tagged stable release (i.e. 1.2.0)
@@ -34,7 +38,7 @@ DEST_DIR=/var/www/arvados-workbench2/workbench2/
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 
 # redHat package file
-RPM_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION).x86_64.rpm
+RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
@@ -80,7 +84,7 @@ $(DEB_FILE): build
         --iteration "$(ITERATION)" \
         --maintainer="$(MAINTAINER)" \
         --description="$(DESCRIPTION)" \
-        --deb-no-default-config-files \
+        --config-files="etc/arvados/workbench2/workbench2.example.json" \
        $(WORKSPACE)/build/=$(DEST_DIR)
 
 $(RPM_FILE): build
@@ -92,7 +96,19 @@ $(RPM_FILE): build
         --iteration "$(ITERATION)" \
         --maintainer="$(MAINTAINER)" \
         --description="$(DESCRIPTION)" \
+        --config-files="etc/arvados/workbench2/workbench2.example.json" \
         $(WORKSPACE)/build/=$(DEST_DIR)
 
+copy: $(DEB_FILE) $(RPM_FILE)
+       for target in $(TARGETS); do \
+               if [[ $$target =~ ^centos ]]; then
+                       cp -p $(RPM_FILE) packages/$$target ; \
+               else
+                       cp -p $(DEB_FILE) packages/$$target ; \
+               fi
+       done
+       rm -f $(RPM_FILE)
+       rm -f $(DEB_FILE)
+
 # use FPM to create DEB and RPM
-packages: $(DEB_FILE) $(RPM_FILE)
+packages: copy