diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-11-10 14:46:23 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2018-11-10 14:46:23 +0100 |
| commit | abf47feca16287f5380f129c4ddea0f2a5278d38 (patch) | |
| tree | d71cab957aa3b3870c5d707674f61e9f661547c9 | |
| parent | 93c9b8862e68a5be51852dbaaf8d2e005c0b2b54 (diff) | |
| download | nx-libs-abf47feca16287f5380f129c4ddea0f2a5278d38.tar.gz nx-libs-abf47feca16287f5380f129c4ddea0f2a5278d38.tar.bz2 nx-libs-abf47feca16287f5380f129c4ddea0f2a5278d38.zip | |
Makefile: drop intermediate NX version vars
| -rw-r--r-- | Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -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 |