fixes

README.md

@@ -46,8 +46,7 @@ How to mod (basic doc):
 
 	Linux:
 	Ensure executable permission on file "devTools/tweeGo/tweego" (not tweego.exe!)
-	Ensure executable permission on file "compile.sh"
-	In the root dir of sources (where you see src, devTools, bin...) run command "./compile.sh" from console
+	In the root dir of sources (where you see src, devTools, bin...) run command "make" from console
 
 	Mac:
 	Not supported directly (I don't have access to Mac for testing).

makefile

 MAKEFLAGS += -r
-TWEEGO := ""
+HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
+COMMIT := $(git rev-parse --short HEAD)
 uname := $(shell uname -s)
 arch := $(shell uname -m)
-ifeq ($(uname),Linux)
-	ifeq ($(arch),x86_64)
-		TWEEGO := ./devTools/tweeGo/tweego_nix64
-	else
-		TWEEGO := ./devTools/tweeGo/tweego_nix86
-	endif
-else ifeq ($(uname),Darwin)
-	ifeq ($(arch),x86_64)
-		TWEEGO := ./devTools/tweeGo/tweego_osx64
-	else
-		TWEEGO := ./devTools/tweeGo/tweego_osx86
+TWEEGO := $(shell command -v tweego || echo "$?")
+ifneq ($(TWEEGO),0)
+	ifeq ($(uname),Linux)
+		ifeq ($(arch),x86_64)
+			TWEEGO := ./devTools/tweeGo/tweego_nix64
+		else
+			TWEEGO := ./devTools/tweeGo/tweego_nix86
+		endif
+	else ifeq ($(uname),Darwin)
+		ifeq ($(arch),x86_64)
+			TWEEGO := ./devTools/tweeGo/tweego_osx64
+		else
+			TWEEGO := ./devTools/tweeGo/tweego_osx86
+		endif
 	endif
+else
+	TWEEGO := "tweego"
 endif
 
 all: bin/FC_pregmod.html bin/resources
 
-bin/resources: ./resources
-	ln -s $< $@
+bin/resources: resources
+	test -L "$@" || ln -s "../$<" bin/
 
 bin/FC_pregmod.html: bin/FC_pregmod_tmp
-	./devTools/embed_favicon.py $@
 	git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
 	mv $< $@
 
 bin/FC_pregmod_tmp: src/gui/mainMenu/AlphaDisclaimer.tw
 	$(TWEEGO) -o $@ src/ --head devTools/head.html
+	./devTools/embed_favicon.py $@
 
 src/gui/mainMenu/AlphaDisclaimer.tw:
-	sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" 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)/" $@
 
 sanity:
 	./sanityCheck.sh
 
 jsanity:
-	./sanityCheck java
+	./sanityCheck.sh java
+
+git: all
+	mv bin/FC_pregmod.html bin/FC_pregmod_$(HASH)_.html
 
-.PHONY: all sanity jsanity
\ No newline at end of file
+.PHONY: all sanity jsanity git