From ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 15 Dec 2017 00:48:35 +0100 Subject: 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 --- nx-X11/config/cf/xorg.cf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nx-X11') 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: -- cgit v1.2.3