nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use make absPath

Browse Source 
check for spaces and err out
This commit is contained in:
edeso 2017-12-01 17:43:07 +01:00
parent 6fccc12905
commit c03e78e94b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile Normal file → Executable file
View File

@ -12,13 +12,19 @@ GLUON_OUTPUTDIR ?= $(CURDIR)/output
GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages
# resolve possibly relative paths or symlinks to make vars reusable in subfolder packages # check for spaces & resolve possibly relative paths to make vars reusable in subfolder packages
makeAbsolute = $(shell realpath -m "$(1)") define Absolve
override GLUON_SITEDIR := $(call makeAbsolute,$(GLUON_SITEDIR)) ifneq (1,$(words [$($(1))]))
override GLUON_TMPDIR := $(call makeAbsolute,$(GLUON_TMPDIR)) $$(error $(1) must not contain spaces!)
override GLUON_OUTPUTDIR := $(call makeAbsolute,$(GLUON_OUTPUTDIR)) endif
override GLUON_IMAGEDIR := $(call makeAbsolute,$(GLUON_IMAGEDIR)) override $(1) = $(abspath $($(1)))
override GLUON_PACKAGEDIR := $(call makeAbsolute,$(GLUON_PACKAGEDIR)) endef
$(eval $(call Absolve,GLUON_SITEDIR))
$(eval $(call Absolve,GLUON_TMPDIR))
$(eval $(call Absolve,GLUON_OUTPUTDIR))
$(eval $(call Absolve,GLUON_IMAGEDIR))
$(eval $(call Absolve,GLUON_PACKAGEDIR))
ifeq ($(V),s) ifeq ($(V),s)
$(info GLUON_SITEDIR="$(GLUON_SITEDIR)") $(info GLUON_SITEDIR="$(GLUON_SITEDIR)")
@ -28,7 +34,6 @@ $(info GLUON_IMAGEDIR="$(GLUON_IMAGEDIR)")
$(info GLUON_PACKAGEDIR="$(GLUON_PACKAGEDIR)") $(info GLUON_PACKAGEDIR="$(GLUON_PACKAGEDIR)")
endif endif
export GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR DEVICES export GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR DEVICES