X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2FMakefile;h=c93a8645f7df477804ecae22d17f784435926542;hb=2617e9a3c03d3fed8e28aca2f4022c369544c404;hp=8b41ceb9c55b58c0f87687f6371f63d082c291f4;hpb=3a6430b13d5b13de264ae33751ff9c69728498d2;p=cc65

diff --git a/src/Makefile b/src/Makefile
index 8b41ceb9c..c93a8645f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,7 +55,7 @@ endif
 ifdef GIT_SHA
   $(info GIT_SHA: $(GIT_SHA))
 else
-  GIT_SHA := $(shell git rev-parse --short HEAD 2>$(NULLDEV))
+  GIT_SHA := $(shell git rev-parse --short HEAD 2>$(NULLDEV) || svnversion 2>$(NULLDEV))
   ifneq ($(words $(GIT_SHA)),1)
     GIT_SHA := N/A
     $(info GIT_SHA: N/A)
@@ -64,8 +64,8 @@ endif
 
 CFLAGS += -MMD -MP -O3 -I common \
           -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
-          -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) -DCL65_TGT=$(CL65_TGT) \
-          -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG) \
+          -DCA65_INC="$(CA65_INC)" -DCC65_INC="$(CC65_INC)" -DCL65_TGT="$(CL65_TGT)" \
+          -DLD65_LIB="$(LD65_LIB)" -DLD65_OBJ="$(LD65_OBJ)" -DLD65_CFG="$(LD65_CFG)" \
           -DGIT_SHA=$(GIT_SHA)
 
 LDLIBS += -lm
@@ -107,7 +107,7 @@ $(RM) /usr/local/bin/$(prog)
 endef # UNAVAIL_recipe
 
 install:
-	$(if $(PREFIX),,$(error variable `PREFIX' must be set))
+	$(if $(PREFIX),,$(error variable "PREFIX" must be set))
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(INSTALL) ../bin/* $(DESTDIR)$(bindir)