Commit abf47fec authored by Ulrich Sibiller's avatar Ulrich Sibiller

Makefile: drop intermediate NX version vars

parent 93c9b886
...@@ -50,11 +50,6 @@ endif ...@@ -50,11 +50,6 @@ endif
IMAKE_DEFINES ?= 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 SHELL:=/bin/bash
NX_X11_HEADERS = \ NX_X11_HEADERS = \
...@@ -106,10 +101,10 @@ test: ...@@ -106,10 +101,10 @@ test:
version: version:
# prepare nx-X11/config/cf/nxversion.def # prepare nx-X11/config/cf/nxversion.def
sed \ sed \
-e 's/###NX_VERSION_MAJOR###/$(NX_VERSION_MAJOR)/' \ -e 's/###NX_VERSION_MAJOR###/$(shell ./version.sh 1)/' \
-e 's/###NX_VERSION_MINOR###/$(NX_VERSION_MINOR)/' \ -e 's/###NX_VERSION_MINOR###/$(shell ./version.sh 2)/' \
-e 's/###NX_VERSION_MICRO###/$(NX_VERSION_MICRO)/' \ -e 's/###NX_VERSION_MICRO###/$(shell ./version.sh 3)/' \
-e 's/###NX_VERSION_PATCH###/$(NX_VERSION_PATCH)/' \ -e 's/###NX_VERSION_PATCH###/$(shell ./version.sh 4)/' \
nx-X11/config/cf/nxversion.def.in \ nx-X11/config/cf/nxversion.def.in \
> nx-X11/config/cf/nxversion.def > nx-X11/config/cf/nxversion.def
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment