Skip to content
Snippets Groups Projects
Commit 7f57ce93 authored by vas's avatar vas
Browse files

remove dupe lines, initialise variables better

parent d17f734b
No related branches found
No related tags found
1 merge request!4610port build system to make
MAKEFLAGS += -r MAKEFLAGS += -r
export TWEEGO_PATH=devTools/tweeGo/storyFormats
HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD) HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
COMMIT := $(shell git rev-parse --short HEAD) COMMIT := $(shell git rev-parse --short HEAD)
uname := $(shell uname -s) uname := $(shell uname -s)
arch := $(shell uname -m) arch := $(shell uname -m)
arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
TWEEGO := $(shell command -v tweego || echo "$$?") TWEEGO := $(shell command -v tweego || echo "$$?")
ifeq ($(TWEEGO),1) ifeq ($(TWEEGO),1)
ifeq ($(uname),Linux) ifeq ($(uname),Linux)
ifeq ($(arch),x86_64) ifeq ($(arch),64)
TWEEGO := ./devTools/tweeGo/tweego_nix64 TWEEGO := devTools/tweeGo/tweego_nix64
else else
TWEEGO := ./devTools/tweeGo/tweego_nix86 TWEEGO := devTools/tweeGo/tweego_nix86
endif endif
else ifeq ($(uname),Darwin) else ifeq ($(uname),Darwin)
ifeq ($(arch),x86_64) ifeq ($(arch),64)
TWEEGO := ./devTools/tweeGo/tweego_osx64 TWEEGO := devTools/tweeGo/tweego_osx64
else else
TWEEGO := ./devTools/tweeGo/tweego_osx86 TWEEGO := devTools/tweeGo/tweego_osx86
endif endif
endif endif
endif endif
...@@ -27,17 +29,16 @@ git: bin/FC_pregmod_$(HASH).html bin/resources ...@@ -27,17 +29,16 @@ git: bin/FC_pregmod_$(HASH).html bin/resources
bin/resources: resources bin/resources: resources
test -L "$@" || ln -s "../$<" bin/ test -L "$@" || ln -s "../$<" bin/
bin/FC_pregmod%.html: bin/FC_pregmod_tmp bin/%.html: bin/tmp
git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
mv $< $@ mv $< $@
bin/FC_pregmod_tmp: bin/ src/gui/mainMenu/AlphaDisclaimer.tw bin/tmp: bin/ src/gui/mainMenu/AlphaDisclaimer.tw
TWEEGO_PATH=devTools/tweeGo/storyFormats $(TWEEGO) -o $@ src/ --head devTools/head.html $(TWEEGO) src/ --head devTools/head.html > $@
./devTools/embed_favicon.py $@ devTools/embed_favicon.py $@
src/gui/mainMenu/AlphaDisclaimer.tw: src/gui/mainMenu/AlphaDisclaimer.tw:
sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@ sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@
sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@
bin/: bin/:
mkdir -p $@ mkdir -p $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment