From af12aa8b2d92828867a843abff18f265ac1a3fa3 Mon Sep 17 00:00:00 2001 From: uz Date: Thu, 29 Dec 2011 21:18:23 +0000 Subject: [PATCH] Fix SVN version stuff. The old implementation apparently had problems with subversion >= 1.7. git-svn-id: svn://svn.cc65.org/cc65/trunk@5349 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/cc65/make/gcc.mak | 6 ++++++ src/cc65/make/watcom.mak | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak index 6116331f1..76b0f08a9 100644 --- a/src/cc65/make/gcc.mak +++ b/src/cc65/make/gcc.mak @@ -28,6 +28,12 @@ LDFLAGS = -lm # Determine the svn version number if possible ifneq "$(shell which svnversion 2>/dev/null)" "" SVNVERSION=$(shell svnversion) +ifeq "$(SVNVERSION)" "exported" +SVNVERSION=unknown +endif +ifeq "$(SVNVERSION)" "Unversioned directory" +SVNVERSION=unknown +endif else SVNVERSION=unknown endif diff --git a/src/cc65/make/watcom.mak b/src/cc65/make/watcom.mak index ea83b0e1b..a5f2887cd 100644 --- a/src/cc65/make/watcom.mak +++ b/src/cc65/make/watcom.mak @@ -29,9 +29,11 @@ EXE = cc65.exe # Determine the svn version number if possible ifneq "$(shell which svnversion 2>/dev/null)" "" -ifneq "$(wildcard .svn)" "" SVNVERSION=$(shell svnversion) -else +ifeq "$(SVNVERSION)" "exported" +SVNVERSION=unknown +endif +ifeq "$(SVNVERSION)" "Unversioned directory" SVNVERSION=unknown endif else -- 2.39.5