diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:21:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:21:39 +0100 |
| commit | 46ef20bdb97bc134bb855f8604828ec314716a32 (patch) | |
| tree | d9170b2bd676cad47a9578e7bed01767af1fc0cc /nx-X11/config | |
| parent | 04962efa95a41cd6f665ebb110a7ce07d99a4554 (diff) | |
| parent | ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec (diff) | |
| download | nx-libs-46ef20bdb97bc134bb855f8604828ec314716a32.tar.gz nx-libs-46ef20bdb97bc134bb855f8604828ec314716a32.tar.bz2 nx-libs-46ef20bdb97bc134bb855f8604828ec314716a32.zip | |
Merge branch 'uli42-pr/custom_version_string' into 3.6.x
Attributes GH PR #607: https://github.com/ArcticaProject/nx-libs/pull/607
Diffstat (limited to 'nx-X11/config')
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 4 |
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: |