aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-29 10:30:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-29 10:30:27 +0200
commitecd335fa61551d0b86d3f075469a7743ab899d95 (patch)
tree430df304b553e345469be822e2b34e446dc6e7a2 /nx-X11/config
parent4cdcd91456a524899cd655f4e4a71a0b256d5746 (diff)
parent4aeed7ad92ac2d4662c9a1af63c32fe6faa5b2fd (diff)
downloadnx-libs-ecd335fa61551d0b86d3f075469a7743ab899d95.tar.gz
nx-libs-ecd335fa61551d0b86d3f075469a7743ab899d95.tar.bz2
nx-libs-ecd335fa61551d0b86d3f075469a7743ab899d95.zip
Merge branch 'uli42-pr/remove_xf86' into 3.6.x
Attirbutes GH PR #249: https://github.com/ArcticaProject/nx-libs/pull/249
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/Imakefile11
-rw-r--r--nx-X11/config/cf/Imakefile4
-rw-r--r--nx-X11/config/cf/xorg.cf1
3 files changed, 2 insertions, 14 deletions
diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile
index 7d1217a46..305b87107 100644
--- a/nx-X11/config/Imakefile
+++ b/nx-X11/config/Imakefile
@@ -13,18 +13,9 @@ SUBDIRS = cf
#if defined(XorgVersionString) \
&& defined(ProjectRoot) && \
defined(BuildBindist)
-all:: version
-
-version: cf/version.def
- RemoveFile(version)
-#if defined (XorgVersionString)
- echo XorgVersionString > version
-#endif
-
-InstallNamedNonExec(version,.$(VENDORNAMESHORT)_Version,ProjectRoot)
+all::
clean::
- RemoveFile(version)
#endif
MakeSubdirs($(SUBDIRS))
diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile
index 22eb09216..a36adf323 100644
--- a/nx-X11/config/cf/Imakefile
+++ b/nx-X11/config/cf/Imakefile
@@ -16,9 +16,7 @@ host.def
#endif
#if defined(XorgVersion)
-VERSIONDEFFILES = \
-date.def \
-version.def
+VERSIONDEFFILES =
#endif
DEFFILES = \
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 9fb92c61f..5ed60e491 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -10,7 +10,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
/* Get and set version information. */
-#include "date.def"
#include "xorgversion.def"
#if !defined(XorgVersionString) && \