From 3fb4ad7800f9cb0bd9b07c71d29bb7bac8e87915 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 29 Jan 2021 16:43:30 +0100 Subject: Makefile fixups --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 05903c5..94e5157 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ WORK_DIR ?= /tmp DGPREFIX ?= /usr/bin DGVALIDATOR ?= $(DGPREFIX)/dgvalidator FUSE_ZIP ?= fuse-zip -FUZERMOUNT ?= fusermount +FUSERMOUNT ?= fusermount ZIP ?= zip MD5SUM ?= md5sum @@ -25,7 +25,7 @@ tool-check: DRSKit2: tool-check # Target config: $(eval VER=2.1) - $(eval FILES=DRSKit_basic.xml DRSKit_full.xml DRSKit_minimal.xml DRSKit_no_whiskers.xml DRSKit_whiskers_only.xml) + $(eval FILES=DRSKit_full.xml DRSKit_basic.xml DRSKit_minimal.xml DRSKit_no_whiskers.xml DRSKit_whiskers_only.xml) # $(eval ZIP_FILE=$(WORK_DIR)/$@-$(VER).zip) $(eval PATCH_FILE=$(WORK_DIR)/$@-$(VER)-patch.zip) @@ -35,7 +35,7 @@ DRSKit2: tool-check [ ! -f $(PATCH_FILE) ] || rm -f $(PATCH_FILE) [ ! -f $(PATCH_FILE).md5 ] || rm -f $(PATCH_FILE).md5 ## Pre compress validation (no audio): - $(foreach F,$(FILES),(echo "Validating $(F) (no audio)"; $(DGVALIDATOR) -p -D-all -n $@/$(F)) &&) true + $(foreach F,$(FILES),(echo "Validating $(F) (no audio)"; $(DGVALIDATOR) -vvv -p -D-all -n $@/$(F)) &&) true ## Compressed target creation: @[ $(AUDIO_SOURCES) != none ] || (echo "AUDIO_SOURCES not set"; false) @[ -d $(AUDIO_SOURCES)/$@ ] || (echo "$@ dir does not exist in AUDIO_SOURCES"; false) @@ -47,7 +47,7 @@ DRSKit2: tool-check mkdir -p $(MOUNT_TARGET) $(FUSE_ZIP) -r $(ZIP_FILE) $(MOUNT_TARGET) $(foreach F,$(FILES),(echo "Validating $(F) (with audio)"; $(DGVALIDATOR) -p -D-all $(MOUNT_TARGET)/$@/$(F)) &&) true - $(FUZERMOUNT) -u $(MOUNT_TARGET) + $(FUSERMOUNT) -u $(MOUNT_TARGET) rmdir $(MOUNT_TARGET) $(MD5SUM) $(ZIP_FILE) > $(ZIP_FILE).md5 $(MD5SUM) $(PATCH_FILE) > $(PATCH_FILE).md5 -- cgit v1.2.3