[X2Go-Commits] [nx-libs] 01/14: Makefile: drop intermediate NX version vars

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit abf47feca16287f5380f129c4ddea0f2a5278d38
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat Nov 10 14:46:23 2018 +0100

    Makefile: drop intermediate NX version vars
---
 Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 9213dda..ffd6322 100644
--- a/Makefile
+++ b/Makefile
@@ -50,11 +50,6 @@ endif
 
 IMAKE_DEFINES	?=
 
-NX_VERSION_MAJOR=$(shell ./version.sh 1)
-NX_VERSION_MINOR=$(shell ./version.sh 2)
-NX_VERSION_MICRO=$(shell ./version.sh 3)
-NX_VERSION_PATCH=$(shell ./version.sh 4)
-
 SHELL:=/bin/bash
 
 NX_X11_HEADERS =		\
@@ -106,10 +101,10 @@ test:
 version:
 	# prepare nx-X11/config/cf/nxversion.def
 	sed \
-	    -e 's/###NX_VERSION_MAJOR###/$(NX_VERSION_MAJOR)/' \
-	    -e 's/###NX_VERSION_MINOR###/$(NX_VERSION_MINOR)/' \
-	    -e 's/###NX_VERSION_MICRO###/$(NX_VERSION_MICRO)/' \
-	    -e 's/###NX_VERSION_PATCH###/$(NX_VERSION_PATCH)/' \
+	    -e 's/###NX_VERSION_MAJOR###/$(shell ./version.sh 1)/' \
+	    -e 's/###NX_VERSION_MINOR###/$(shell ./version.sh 2)/' \
+	    -e 's/###NX_VERSION_MICRO###/$(shell ./version.sh 3)/' \
+	    -e 's/###NX_VERSION_PATCH###/$(shell ./version.sh 4)/' \
 	    nx-X11/config/cf/nxversion.def.in \
 	    > nx-X11/config/cf/nxversion.def
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git