Improve package version assignment

stepmania · Dec 25, 2015 · 8fde8fa · 8fde8fa
1 parent 087d2b4
commit 8fde8fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/makefile b/makefile
@@ -169,11 +169,12 @@ pre_gen:
 	rm mpi.c
 
 zipup:
-	rm -rf ../libtommath-$(VERSION) && rm -f ../ltm-$(VERSION).zip ../ltm-$(VERSION).tar.bz2
-	git archive HEAD --prefix=libtommath-$(VERSION)/ > ../libtommath-$(VERSION).tar
-	cd .. ; tar xf libtommath-$(VERSION).tar 
-	MAKE=${MAKE} ${MAKE} -C ../libtommath-$(VERSION) clean manual poster docs
-	tar -c ../libtommath-$(VERSION)/* | xz -9 > ../ltm-$(VERSION).tar.xz 
+	rm -rf ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) \
+		&& rm -f ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).zip ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar.bz2
+	git archive HEAD --prefix=libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)/ > ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar
+	cd .. ; tar xf libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar
+	MAKE=${MAKE} ${MAKE} -C ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) clean manual poster docs
+	tar -c ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)/* | xz -9 > ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar.xz
 
 new_file:
 	bash updatemakes.sh

diff --git a/makefile.include b/makefile.include
@@ -3,8 +3,9 @@
 #
 
 #version of library
-VERSION=0.43.0
-VERSION_SO=0:43
+VER_MAJOR=0
+VER_MINOR=43
+VER_PATCH=0
 
 # default make target
 default: ${LIBNAME}

diff --git a/makefile.shared b/makefile.shared
@@ -48,7 +48,7 @@ objs: $(OBJECTS)
 	$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
 
 $(LIBNAME):  $(OBJECTS)
-	$(LT) --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO)
+	$(LT) --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VER_MAJOR):$(VER_MINOR)
 
 install: $(LIBNAME)
 	install -d $(DESTDIR)$(LIBPATH)