Browse code

set 1.4.0 release version

Stefan Sayer authored on 15/03/2011 10:12:34
Showing 1 changed files
... ...
@@ -3,29 +3,29 @@ else
3 3
 makefile_defs=1
4 4
 export makefile_defs
5 5
 
6
-GIT = $(shell which git)
7
-SVNVERSION = $(shell which svnversion)
8
-
9
-ifneq ($(GIT),)
10
-   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
-        then git describe --always --dirty 2>/dev/null; \
12
-        else git describe --always 2>/dev/null; fi)
13
-endif
14
-
15
-ifeq ($(SCM_REV),)
16
-ifneq ($(SVNVERSION),)
17
-   SCM_REV = r$(shell svnversion -n .)
18
-endif
19
-endif
6
+#GIT = $(shell which git)
7
+#SVNVERSION = $(shell which svnversion)
8
+#
9
+#ifneq ($(GIT),)
10
+#   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
+#        then git describe --always --dirty 2>/dev/null; \
12
+#        else git describe --always 2>/dev/null; fi)
13
+#endif
14
+#
15
+#ifeq ($(SCM_REV),)
16
+#ifneq ($(SVNVERSION),)
17
+#   SCM_REV = r$(shell svnversion -n .)
18
+#endif
19
+#endif
20 20
 
21 21
 #version number
22 22
 VERSION = 1
23 23
 PATCHLEVEL = 4
24 24
 SUBLEVEL = 0
25 25
 
26
-ifneq ($(SCM_REV),)
27
-EXTRAVERSION = -dev-$(SCM_REV)
28
-endif
26
+#ifneq ($(SCM_REV),)
27
+#EXTRAVERSION = -dev-$(SCM_REV)
28
+#endif
29 29
 
30 30
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
31 31
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)