make most vars immediate

This commit is contained in:
Rhiannon Morris 2020-07-19 18:05:01 +02:00
parent ecaba4e33d
commit 9e98398830

View file

@ -1,30 +1,30 @@
DATADIR = data DATADIR := data
TMPDIR = _tmp TMPDIR := _tmp
BUILDDIR = _build BUILDDIR := _build
INFONAME = info.yaml INFONAME := info.yaml
ROOT = https://gallery.niss.website ROOT := https://gallery.niss.website
# SMALL = thumbnails, MED = single pages (link to full size) # SMALL = thumbnails, MED = single pages (link to full size)
SMALL := 200 SMALL := 200
MEDW := 1000 MEDW := 1000
MEDH := 1200 MEDH := 1200
MAKEPAGES = $(TMPDIR)/make-pages MAKEPAGES := $(TMPDIR)/make-pages
YAMLS != find $(DATADIR) -name $(INFONAME) YAMLS != find $(DATADIR) -name $(INFONAME)
SCRIPTS := $(wildcard script/*.js) SCRIPTS := $(wildcard script/*.js)
STYLES := $(wildcard style/*.css) STYLES := $(wildcard style/*.css)
STYLESVGS = $(wildcard style/*.svg) STYLESVGS := $(wildcard style/*.svg)
STYLEPNGS = $(wildcard style/*.png) STYLEPNGS := $(wildcard style/*.png)
FONTS := $(shell find fonts \ FONTS := $(shell find fonts \
-iname '*.eot' -or -iname '*.svg' -or \ -iname '*.eot' -or -iname '*.svg' -or \
-iname '*.ttf' -or -iname '*.woff' -or \ -iname '*.ttf' -or -iname '*.woff' -or \
-iname '*.woff2' -or -iname '*.css') -iname '*.woff2' -or -iname '*.css')
STATIC := $(SCRIPTS) $(STYLES) $(STYLEPNGS) $(STYLESVGS) $(FONTS) STATIC := $(SCRIPTS) $(STYLES) $(STYLEPNGS) $(STYLESVGS) $(FONTS)
BSTATIC := $(patsubst %,$(BUILDDIR)/%,$(STATIC)) BSTATIC := $(patsubst %,$(BUILDDIR)/%,$(STATIC))
.PHONY: all build .PHONY: all build
@ -74,10 +74,10 @@ distclean: clean
rm -rf dist-newstyle rm -rf dist-newstyle
HOST ?= gallery.niss.website HOST ?= gallery.niss.website
REMOTE_USER ?= www-data REMOTE_USER ?= www-data
IDFILE ?= ~/.ssh/xyz IDFILE ?= ~/.ssh/xyz
REMOTE_DIR ?= gallery REMOTE_DIR ?= gallery
.PHONY: upload .PHONY: upload
upload: build upload: build