diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-06-21 10:50:31 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-06-21 10:50:31 +0200 |
| commit | fb2a4e4c510a80630722834f2cf408f8b731b4ef (patch) | |
| tree | 3418ca9ac7561a45bae51c45dc272b61de0c5015 /nx-X11/config/Imakefile | |
| parent | cc92f77e9a3f20516de4276ecf8e178974ca1593 (diff) | |
| parent | 26091f4bd6b975eaabafc042c7af50b22042e508 (diff) | |
| download | nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.gz nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.bz2 nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.zip | |
Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x
Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41
Diffstat (limited to 'nx-X11/config/Imakefile')
| -rw-r--r-- | nx-X11/config/Imakefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile index 5c95a5d80..03b9f5b94 100644 --- a/nx-X11/config/Imakefile +++ b/nx-X11/config/Imakefile @@ -15,16 +15,14 @@ BOOTSTRAPSUBDIRS = \ SUBDIRS = cf $(BOOTSTRAPSUBDIRS) -#if (defined(XFree86VersionString) || defined(XorgVersionString)) \ +#if defined(XorgVersionString) \ && defined(ProjectRoot) && \ defined(BuildBindist) all:: version version: cf/version.def RemoveFile(version) -#if defined (XFree86VersionString) - echo XFree86VersionString > version -#elif defined (XorgVersionString) +#if defined (XorgVersionString) echo XorgVersionString > version #endif |