diff options
| author | dpw <empty> | 1995-05-18 20:36:02 +0000 |
|---|---|---|
| committer | dpw <empty> | 1995-05-18 20:36:02 +0000 |
| commit | ea1952244efc2d5320089f96d506984b101cd061 (patch) | |
| tree | 2f1dd178e6eb300bf372e0bcc8f55ec242f9b457 /xc/programs | |
| parent | 5ce3b29d1bbd83e665004714ca011d43a2f1e8e7 (diff) | |
fix XBUG 7170: allow overriding of vendor string and vendor releasee
Diffstat (limited to 'xc/programs')
| -rw-r--r-- | xc/programs/Xserver/dix/Imakefile | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/xc/programs/Xserver/dix/Imakefile b/xc/programs/Xserver/dix/Imakefile index b64447a1a..23f0c76ba 100644 --- a/xc/programs/Xserver/dix/Imakefile +++ b/xc/programs/Xserver/dix/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.46 94/02/04 10:51:26 rws Exp kaleb $ +XCOMM $XConsortium: Imakefile,v 1.47 94/11/21 18:27:00 kaleb Exp dpw $ #include <Server.tmpl> SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \ @@ -40,12 +40,24 @@ DEFAULTDISPLAYCLASS = DefaultDisplayClass SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\" #endif +#ifdef XVendorString +VENDORSTRING = XVendorString + VENDOR_STRING = -DVENDOR_STRING=\"$(VENDORSTRING)\" +#endif + +#ifdef XVendorRelease +VENDORRELEASE = XVendorRelease + VENDOR_RELEASE = -DVENDOR_RELEASE=$(VENDORRELEASE) +#endif + #if HasKrb5 K5DEFS = Krb5Defines #endif SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS) +VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) + NormalLibraryObjectRule() NormalLibraryTarget(dix,$(OBJS)) LintLibraryTarget(dix,$(SRCS)) @@ -54,6 +66,7 @@ NormalLintTarget($(SRCS)) SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES)) SpecialCObjectRule(tables,$(ICONFIGFILES),$(K5DEFS)) SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(K5DEFS)) +SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES)) InstallLinkKitLibrary(dix,$(LINKKITDIR)/lib) |