summaryrefslogtreecommitdiff
path: root/Imakefile
diff options
context:
space:
mode:
authordawes <dawes>2006-06-28 03:20:26 +0000
committerdawes <dawes>2006-06-28 03:20:26 +0000
commitf5f04b06cf2cfd61f768cdea912ead9bf55f9754 (patch)
tree3f8a1b7a9c121968c731a57ced3014bf2fedde4d /Imakefile
parent2f83fe138e308db3ea39e0e8324baf93f5c3e0be (diff)
42. Avoid memory leaks in command line processing (David Dawes).
41. Improve support for the XFree86CustomVersion imake parmeter, and customisation of some initial server messages (David Dawes). plus some typo fixes
Diffstat (limited to 'Imakefile')
-rw-r--r--Imakefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Imakefile b/Imakefile
index 146411a56..2c9129290 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,10 +1,14 @@
-XCOMM $XFree86: xc/Imakefile,v 3.34tsi Exp $
+XCOMM $XFree86: xc/Imakefile,v 3.35 2006/05/16 16:01:49 tsi Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
#ifdef XFree86VersionString
+#ifndef XFree86CustomVersion
VERSTRING = " "version XFree86VersionString "("XFree86DateString")"
+#else
+VERSTRING = " "version XFree86VersionString "("XFree86DateString") ("XFree86CustomVersion")"
+#endif
#endif
#ifndef OSName
@@ -51,7 +55,7 @@ DependSubdirs($(SUBDIRS))
#ifdef XFree86VersionString
VerifyOS::
@echo ""
- @echo Building XFree86 version XFree86VersionString "("XFree86DateString")."
+ @echo Building XFree86$(VERSTRING).
#endif
#ifdef OSRelVersion
VerifyOS::