aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-12-15 00:48:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-05 23:18:58 +0100
commitec1b3a44c0653e21dd252e1727ed42f86f0bb0ec (patch)
treed9170b2bd676cad47a9578e7bed01767af1fc0cc /nx-X11
parent04962efa95a41cd6f665ebb110a7ce07d99a4554 (diff)
downloadnx-libs-ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec.tar.gz
nx-libs-ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec.tar.bz2
nx-libs-ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec.zip
Add support for custom version string
Make nxproxy and nxagent print an arbitrary version number by running make NX_VERSION_CUSTOM="myvers". nxagent and nxproxy will then show this in addition to the original version number: NXPROXY - Version myvers (3.5.99.22) NXAGENT - Version myvers (3.5.99.22) Fixes ArcticaProject/nx-libs#606
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/config/cf/xorg.cf4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index f9928b928..0444d18cc 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -59,8 +59,12 @@ RELEASE_VERSION = ReleaseVersion
#if !defined(nxVersionString) && \
defined(NX_VERSION_MAJOR) && defined(NX_VERSION_MINOR) && \
defined(NX_VERSION_MICRO) && defined(NX_VERSION_PATCH)
+#if defined(NX_VERSION_CUSTOM)
+# define nxVersionString NX_VERSION_CUSTOM (`echo NX_VERSION_MAJOR NX_VERSION_MINOR NX_VERSION_MICRO NX_VERSION_PATCH | sed 's/ /./g'`)
+#else
# define nxVersionString `echo NX_VERSION_MAJOR NX_VERSION_MINOR NX_VERSION_MICRO NX_VERSION_PATCH | sed 's/ /./g'`
#endif
+#endif
/*
* NX versions are M.m.ยต.p, and NXVersion is: