Merge pull request #1311 from ghaerr/060

[release] Increment version to 0.6.0
ghaerr · Jun 7, 2022 · 850f549 · 850f549
2 parents bf0fa04 + 70f9a92
commit 850f549
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/buildimages.sh b/buildimages.sh
@@ -32,6 +32,7 @@ build_ibm()
 
     cd image
     make images
+    cd ..
 }
 
 make clean

diff --git a/elks/Makefile-rules b/elks/Makefile-rules
@@ -56,7 +56,7 @@ include $(TOPDIR)/Make.defs
 # State the current version of this system.
 
 VERSION 	= 0	# (0-255)
-PATCHLEVEL	= 5	# (0-255)
+PATCHLEVEL	= 6	# (0-255)
 SUBLEVEL	= 0	# (0-255)
 #PRE		= 0	# (0-255)	If not a pre, comment this line.
 

diff --git a/libc/Makefile.inc b/libc/Makefile.inc
@@ -1,8 +1,6 @@
 
-VERSION=elks-0.5.0
-
 INCLUDES=-I$(TOPDIR)/include -I$(TOPDIR)/libc/include -I$(TOPDIR)/elks/include
-DEFINES=-D__LIBC__ -D__LIBC_VER__='"$(VERSION)"'
+DEFINES=-D__LIBC__
 
 INCS=$(INCLUDES)
 SDEFS=$(DEFINES)
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ build_ibm() @@
         cd image
         make images
+        cd ..
     }
     make clean
@@ Expand Down @@