diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-17 09:28:03 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-17 09:28:03 +0100 |
| commit | c910bf7cd3c5a7ec079fee08234f51dea0deb576 (patch) | |
| tree | 4f6b6a523afa97e065c3c786e2c6d4ae3a00893f /Makefile | |
| parent | 65deb86f8dab0c88e051b5ac416b7907433aa849 (diff) | |
| parent | 203d97147623b97a48c0f6456cc1de9d8364db03 (diff) | |
| download | nx-libs-c910bf7cd3c5a7ec079fee08234f51dea0deb576.tar.gz nx-libs-c910bf7cd3c5a7ec079fee08234f51dea0deb576.tar.bz2 nx-libs-c910bf7cd3c5a7ec079fee08234f51dea0deb576.zip | |
Merge pull request #3 from sunweaver/feature/nxagent-version-v2
Make nxagent aware of its NX'ish version string (and number).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 19 insertions, 0 deletions
@@ -19,6 +19,11 @@ NXLIBDIR ?= $(PREFIX)/lib/nx X2GOLIBDIR ?= $(PREFIX)/lib/x2go CONFIGURE ?= ./configure +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 %: @@ -44,7 +49,21 @@ build-full: cd nxcomp && autoconf cd nxcompext && autoconf cd nxcompshad && autoconf + + # 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)/' \ + nx-X11/config/cf/nxversion.def.in \ + > nx-X11/config/cf/nxversion.def + cd nx-X11 && ${MAKE} World + + # clean directly after build + rm -f nx-X11/config/cf/nxversion.def + cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} build: |