From d32d0d56f03e0fba2b117e0b6a5d3be3526f9c56 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 15 Jan 2018 08:20:05 +0300 Subject: [PATCH] more small fixes and tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index af50f2e7..24212680 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -286,8 +286,8 @@ check: $(foreach dep,$(DEPENDENCIES),require($(dep))) # build rules... NODE_MODULES_MINIMAL = $(foreach m,$(INCLUDE_NODE_MODULES),$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/$(m)) -PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME) $(NODE_MODULES_MINIMAL) -PACK_FULL = $(BUILD_DIR)/$(APP_NAME) $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR) +PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME)/ $(NODE_MODULES_MINIMAL) +PACK_FULL = $(BUILD_DIR)/$(APP_NAME)/ $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR) # build date... @@ -381,8 +381,10 @@ $(DIST_DIR)/$(APP_NAME)-$(VERSION)-web.zip: $(PACK_MINIMAL) # helpers... up = $(subst $(eval) ,/,$(foreach x,$(subst /, ,$1),..)) -zipfrom = cd $1 ; zip -r "$(call up,$1)/$2" $3 -zipdelfrom = cd $1 ; zip -d "$(call up,$1)/$2" $3 +zipfrom = cd $1 ; \ + zip -r "$(call up,$1)/$2" $3 +zipdelfrom = cd $1 ; \ + zip -d "$(call up,$1)/$2" $3