From 9fa03fa2d3462b2a1550bc99eaa20c9848085b1a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 31 Jan 2019 13:36:33 +0100 Subject: [PATCH] www: build proxmox-backup-gui.js into the js/ subdir The server expects an images/ subdir and a js/ subdir, so we should also compile our files using the same structure. Signed-off-by: Wolfgang Bumiller --- debian/install | 2 +- www/Makefile | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/install b/debian/install index 617f9376..ccc1a106 100644 --- a/debian/install +++ b/debian/install @@ -5,4 +5,4 @@ target/release/proxmox-backup-client /usr/sbin target/release/catar /usr/sbin www/images/logo-128.png /usr/share/javascript/proxmox-backup/images/ www/images/proxmox_logo.png /usr/share/javascript/proxmox-backup/images/ -www/proxmox-backup-gui.js /usr/share/javascript/proxmox-backup/js/ +www/js/proxmox-backup-gui.js /usr/share/javascript/proxmox-backup/js/ diff --git a/www/Makefile b/www/Makefile index 3f20507d..2f063f84 100644 --- a/www/Makefile +++ b/www/Makefile @@ -11,14 +11,16 @@ JSSRC= \ Application.js \ MainView.js -all: proxmox-backup-gui.js +all: js/proxmox-backup-gui.js -proxmox-backup-gui.js: OnlineHelpInfo.js ${JSSRC} +js: + mkdir js + +js/proxmox-backup-gui.js: js OnlineHelpInfo.js ${JSSRC} cat OnlineHelpInfo.js ${JSSRC} >$@.tmp mv $@.tmp $@ .PHONY: clean clean: find . -name '*~' -exec rm {} ';' - rm -f proxmox-backup-gui.js - + rm -rf js