diff -urN XFree86-4.0.orig/xc/config/cf/Imake.tmpl XFree86-4.0/xc/config/cf/Imake.tmpl
--- XFree86-4.0.orig/xc/config/cf/Imake.tmpl Tue Mar 7 16:54:17 2000
+++ XFree86-4.0/xc/config/cf/Imake.tmpl Fri Mar 17 02:19:49 2000
-@@ -555,9 +555,9 @@
- #endif
- #ifndef VarLibDir
- #ifdef ProjectVar
--#define VarLibDir Concat(ProjectVar,/lib)
-+#define VarLibDir Concat(ProjectVar,/state)
- #else
--#define VarLibDir /var/lib
-+#define VarLibDir /var/state
- #endif
- #endif
-
@@ -585,11 +585,7 @@
#define LintlibDir $(USRLIBDIR)/lint
#endif
/*
* If your system doesn't support vm86() mode and you have
-diff -urN XFree86-4.0.orig/xc/config/imake/Makefile.proto XFree86-4.0/xc/config/imake/Makefile.proto
---- XFree86-4.0.orig/xc/config/imake/Makefile.proto Thu Jan 1 01:00:00 1970
-+++ XFree86-4.0/xc/config/imake/Makefile.proto Fri Mar 17 02:19:49 2000
-@@ -0,0 +1,860 @@
-+# Makefile generated by imake - do not edit!
-+# $TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $
-+
-+# ----------------------------------------------------------------------
-+# Makefile generated from "Imake.tmpl" and <./config/imake/Imakefile>
-+# $TOG: Imake.tmpl /main/249 1997/10/13 15:28:56 kaleb $
-+#
-+#
-+#
-+#
-+# $XFree86: xc/config/cf/Imake.tmpl,v 3.65 2000/01/31 19:33:18 dawes Exp $
-+# ----------------------------------------------------------------------
-+
-+all::
-+
-+.SUFFIXES: .i
-+
-+# $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
-+
-+# $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
-+
-+# -----------------------------------------------------------------------
-+# site-specific configuration parameters that need to come before
-+# the platform-specific parameters - edit site.def to change
-+
-+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-+
-+# site: $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Exp $
-+
-+# $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
-+
-+# ----------------------------------------------------------------------
-+# platform-specific configuration parameters - edit linux.cf to change
-+
-+# platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
-+# platform: $XFree86: xc/config/cf/linux.cf,v 3.115 2000/02/21 18:05:31 dawes Exp $
-+
-+# operating system: Linux 2.2.14 i586 [ELF] (2.2.14)
-+# libc: (6.1.2)
-+# binutils: (29)
-+
-+# $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $
-+# $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $
-+
-+# $XFree86: xc/config/cf/xfree86.cf,v 3.269 2000/02/17 13:50:02 dawes Exp $
-+
-+# $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
-+
-+AFB_DEFS = -DUSE_AFB
-+
-+DRIVERSDKDIR = $(USRLIBDIR)/Server
-+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
-+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
-+
-+ XF86SRC = $(SERVERSRC)/hw/xfree86
-+ XF86ACCELSRC = $(XF86SRC)/accel
-+ XF86COMSRC = $(XF86SRC)/common
-+ XF86PARSERSRC = $(XF86SRC)/parser
-+ XF86OSSRC = $(XF86SRC)/os-support
-+ XF86DRIVERSRC = $(XF86SRC)/drivers
-+ DRIVERSRC = $(XF86DRIVERSRC)
-+ S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
-+ S3VDRIVERSRC = $(XF86SRC)/accel/s3_virge/drivers
-+
-+ XF68SRC = $(SERVERSRC)/hw/xfree68
-+ XF68COMSRC = $(XF68SRC)/common
-+ XF68PARSERSRC = $(XF68SRC)/parser
-+ XF68OSSRC = $(XF68SRC)/os-support
-+
-+ XF98SRC = $(SERVERSRC)/hw/xfree98
-+ XF98ACCELSRC = $(XF98SRC)/accel
-+ XF98COMSRC = $(XF98SRC)/common
-+ XF98OSSRC = $(XF98SRC)/os-support
-+ XF98DRIVERSRC = $(XF98SRC)/drivers
-+ XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers
-+XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers
-+ XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers
-+ XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers
-+XF98NECS3DRIVERSRC = $(XF98SRC)/accel/s3nec/drivers
-+XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers
-+ XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers
-+XF98GA968DRIVERSRC = $(XF98SRC)/accel/s3ga968/drivers
-+
-+ XFREE86DOCDIR = $(DOCDIR)
-+ XFREE86PSDOCDIR = $(DOCPSDIR)
-+ XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
-+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
-+
-+# $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
-+# $XFree86: xc/config/cf/xf86.rules,v 3.30 1999/10/13 16:49:02 dawes Exp $
-+
-+# ----------------------------------------------------------------------
-+# site-specific configuration parameters that go after
-+# the platform-specific parameters - edit site.def to change
-+
-+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-+
-+# site: $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Exp $
-+
-+# ---------------------------------------------------------------------
-+# Imake rules for building libraries, programs, scripts, and data files
-+# rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
-+#
-+#
-+#
-+#
-+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.64 2000/02/13 06:15:16 dawes Exp $
-+
-+ _NULLCMD_ = @ echo -n
-+
-+GLIDEINCDIR =
-+
-+TKLIBNAME =
-+
-+TKLIBDIR =
-+
-+TCLLIBNAME =
-+
-+TCLIBDIR =
-+
-+ PATHSEP = /
-+ SHELL = /bin/sh
-+
-+ TOP = ../..
-+ CURRENT_DIR = ./config/imake
-+
-+ IMAKE = $(IMAKESRC)/imake
-+ DEPEND = $(DEPENDSRC)/makedepend
-+ MKDIRHIER = mkdir -p
-+ REVPATH = $(CONFIGSRC)/util/revpath
-+ EXPORTLISTGEN =
-+ CONFIGSRC = $(TOP)/config
-+ IMAKESRC = $(CONFIGSRC)/imake
-+ DEPENDSRC = $(CONFIGSRC)/makedepend
-+
-+ INCROOT = /usr/X11R6/include
-+ USRLIBDIR = /usr/X11R6/lib
-+ VARLIBDIR = /var/lib
-+ SHLIBDIR = /usr/X11R6/lib
-+ LINTLIBDIR = $(USRLIBDIR)/lint
-+ MANPATH = /usr/X11R6/man
-+ MANSOURCEPATH = $(MANPATH)/man
-+ MANDIR = $(MANSOURCEPATH)1
-+ LIBMANDIR = $(MANSOURCEPATH)3
-+ FILEMANDIR = $(MANSOURCEPATH)5
-+ MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX)
-+ DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
-+ LOGDIRECTORY = /var/log
-+
-+ VARRUNDIR = /var/run
-+
-+ VARDBDIR = /var/state
-+
-+ AR = ar clq
-+ BOOTSTRAPCFLAGS =
-+ CC = gcc
-+ AS = as
-+
-+.SUFFIXES: .cc
-+
-+ CXX = c++
-+ CXXFILT = c++filt
-+ CXXLIB =
-+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce
-+CXXDEPENDINCLUDES =
-+ CXXEXTRA_DEFINES =
-+CXXEXTRA_INCLUDES =
-+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE $(CXXPROJECT_DEFINES)
-+ CXXOPTIONS =
-+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
-+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
-+ CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
-+
-+ COMPRESS = compress
-+ GZIPCMD = gzip
-+ CPP = /lib/cpp $(STD_CPP_DEFINES)
-+ RAWCPP = /lib/cpp -undef $(STD_CPP_OPTIONS)
-+ PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
-+ INSTALL = install
-+ INSTALLFLAGS = -c
-+ LD = ld
-+ LEX = flex -l
-+ LEXLIB = -lfl
-+ YACC = bison -y
-+ CCYACC = bison -y
-+ LINT = lint
-+ LINTLIBFLAG = -C
-+ LINTOPTS = -axz
-+ LN = ln -s
-+ MAKE = make
-+ MV = mv -f
-+ CP = cp
-+
-+ RANLIB = ranlib
-+ RANLIBINSTFLAGS =
-+
-+ RM = rm -f
-+ MANSUFFIX = 1x
-+ LIBMANSUFFIX = 3x
-+ FILEMANSUFFIX = 5x
-+ MISCMANSUFFIX = 7
-+ DRIVERMANSUFFIX = 4
-+ MANDEFS = -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX)
-+
-+ TROFF = groff -Tps
-+ NROFF = nroff
-+ MSMACROS = -ms
-+ MANMACROS = -man
-+ TBL = tbl
-+ EQN = eqn
-+ NEQN = neqn
-+ COL = col
-+ COLFLAGS = -b
-+ MODCC = gcc
-+ MODCPP = /lib/cpp
-+ MODCFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREAD_CFLAGS) $(ALLDEFINES)
-+ MODAS = as
-+ MODASFLAGS =
-+ MODLD = ld
-+ MODLDFLAGS =
-+MODLDCOMBINEFLAGS = -r
-+ MODAR = ar clq
-+ MODRANLIB =
-+
-+ DVIPS = dvips
-+ LATEX = latex
-+
-+ STD_INCLUDES =
-+ STD_CPP_OPTIONS = -traditional
-+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE $(PROJECT_DEFINES)
-+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE $(PROJECT_DEFINES)
-+ EXTRA_LOAD_FLAGS = -Wl,-rpath-link,$(BUILDLIBDIR)
-+ EXTRA_LDOPTIONS =
-+ EXTRA_LIBRARIES =
-+ TAGS = ctags
-+
-+ PARALLELMFLAGS =
-+
-+ SHAREDCODEDEF =
-+ SHLIBDEF =
-+
-+ SHLIBLDFLAGS = -shared
-+
-+ PICFLAGS = -fPIC
-+
-+ CXXPICFLAGS = -fPIC
-+
-+ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
-+
-+ INSTPGMFLAGS = -s
-+
-+ INSTBINFLAGS = -m 0755
-+ INSTUIDFLAGS = -m 4711
-+ INSTLIBFLAGS = -m 0644
-+ INSTINCFLAGS = -m 0444
-+ INSTMANFLAGS = -m 0444
-+ INSTDATFLAGS = -m 0444
-+ INSTKMEMFLAGS = -m 4711
-+
-+ PROJECTROOT = /usr/X11R6
-+
-+ CDEBUGFLAGS = -O2 -fno-strength-reduce
-+ CCOPTIONS = -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
-+
-+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-+ LDPRELIB = -L$(BUILDLIBDIR)
-+ LDPOSTLIB =
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+
-+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-+
-+ CCLINK = $(CC)
-+
-+ CXXLINK = $(CXX)
-+
-+ LDSTRIPFLAGS = -x
-+ LDCOMBINEFLAGS = -r
-+ DEPENDFLAGS =
-+
-+# Not sure this belongs here
-+ TKLIBDIR =
-+ TKINCDIR =
-+ TKLIBNAME =
-+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
-+ TCLLIBDIR =
-+ TCLINCDIR =
-+ TCLLIBNAME =
-+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
-+
-+ MACROFILE = linux.cf
-+ RM_CMD = $(RM)
-+
-+ IMAKE_DEFINES =
-+
-+ IRULESRC = $(CONFIGSRC)/cf
-+ IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
-+
-+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
-+
-+# $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $
-+
-+# $XFree86: xc/config/cf/X11.rules,v 1.4 1997/09/09 11:56:20 hohndel Exp $
-+
-+# ----------------------------------------------------------------------
-+# X Window System Build Parameters and Rules
-+# $TOG: X11.tmpl /main/308 1998/06/16 15:14:24 msr $
-+#
-+#
-+#
-+#
-+# $XFree86: xc/config/cf/X11.tmpl,v 1.59 2000/02/18 16:23:07 dawes Exp $
-+
-+STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
-+
-+FCHOWN_DEFINES = -DHAS_FCHOWN
-+
-+# -----------------------------------------------------------------------
-+# X Window System make variables; these need to be coordinated with rules
-+
-+ XTOP = $(TOP)
-+ BINDIR = /usr/X11R6/bin
-+ BUILDINCROOT = $(TOP)/exports
-+ BUILDINCDIR = $(BUILDINCROOT)/include
-+ BUILDINCTOP = ../..
-+ BUILDLIBDIR = $(TOP)/exports/lib
-+ BUILDLIBTOP = ../..
-+ BUILDBINDIR = $(TOP)/exports/bin
-+ BUILDBINTOP = ../..
-+ BUILDMODULEDIR = $(BUILDLIBDIR)/modules
-+ BUILDMODULETOP = $(BUILDLIBTOP)/..
-+ XBUILDINCROOT = $(XTOP)/exports
-+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
-+ XBUILDINCTOP = ../../..
-+ XBUILDBINDIR = $(XBUILDINCROOT)/bin
-+ INCDIR = $(INCROOT)
-+ ADMDIR = /usr/adm
-+ LIBDIR = $(USRLIBDIR)/X11
-+ LIBEXECDIR = /usr/X11R6/libexec
-+ MODULEDIR = $(USRLIBDIR)/modules
-+ TOP_X_INCLUDES = -I$(TOP)/exports/include
-+
-+ VARDIR = /var/X11
-+
-+ ETCX11DIR = /etc/X11
-+
-+ CONFDIR = $(ETCX11DIR)
-+
-+ DOCDIR = $(LIBDIR)/doc
-+ DOCHTMLDIR = $(DOCDIR)/html
-+ DOCPSDIR = $(DOCDIR)/PostScript
-+ FONTDIR = $(LIBDIR)/fonts
-+ ENCODINGSDIR = $(FONTDIR)/encodings
-+ XINITDIR = $(LIBDIR)/xinit
-+ XDMDIR = $(LIBDIR)/xdm
-+ XDMVARDIR = $(VARLIBDIR)/xdm
-+ TWMDIR = $(LIBDIR)/twm
-+ XSMDIR = $(LIBDIR)/xsm
-+ NLSDIR = $(LIBDIR)/nls
-+ XLOCALEDIR = $(LIBDIR)/locale
-+ PEXAPIDIR = $(LIBDIR)/PEX
-+ LBXPROXYDIR = $(LIBDIR)/lbxproxy
-+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr
-+ XPRINTDIR = $(LIBDIR)/xserver
-+ XAPPLOADDIR = $(LIBDIR)/app-defaults
-+ FONTCFLAGS = -t
-+
-+ INSTAPPFLAGS = $(INSTDATFLAGS)
-+
-+ RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
-+ FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
-+ MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
-+
-+ DOCUTILSRC = $(XTOP)/doc/util
-+ CLIENTSRC = $(TOP)/clients
-+ DEMOSRC = $(TOP)/demos
-+ XDOCMACROS = $(DOCUTILSRC)/macros.t
-+ XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
-+ PROGRAMSRC = $(TOP)/programs
-+ LIBSRC = $(XTOP)/lib
-+ FONTSRC = $(XTOP)/fonts
-+ ENCODINGSSRC = $(FONTSRC)/encodings
-+ INCLUDESRC = $(BUILDINCROOT)/include
-+ XINCLUDESRC = $(INCLUDESRC)/X11
-+ SERVERSRC = $(XTOP)/programs/Xserver
-+ CONTRIBSRC = $(XTOP)/../contrib
-+ UNSUPPORTEDSRC = $(XTOP)/unsupported
-+ DOCSRC = $(XTOP)/doc
-+ RGBSRC = $(XTOP)/programs/rgb
-+ BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
-+ MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-+ FONTSERVERSRC = $(PROGRAMSRC)/xfs
-+ FONTINCSRC = $(XTOP)/include/fonts
-+ EXTINCSRC = $(XTOP)/include/extensions
-+ FTSOURCEDIR = $(TOP)/extras/FreeType
-+ XTTSOURCEDIR = $(TOP)/extras/X-TrueType
-+ TRANSCOMMSRC = $(LIBSRC)/xtrans
-+ TRANS_INCLUDES = -I$(TRANSCOMMSRC)
-+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
-+
-+ XENVLIBDIR = $(TOP)/exports/lib
-+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
-+
-+# $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $
-+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.12 1999/06/27 14:07:17 dawes Exp $
-+
-+ XLIBSRC = $(LIBSRC)/X11
-+
-+SOXLIBREV = 6.1
-+DEPXONLYLIB =
-+XONLYLIB = -lX11
-+
-+LINTXONLY = $(XLIBSRC)/llib-X11.ln
-+
-+ XLIBONLY = $(XONLYLIB)
-+
-+ XEXTLIBSRC = $(LIBSRC)/Xext
-+
-+SOXEXTREV = 6.4
-+DEPEXTENSIONLIB =
-+EXTENSIONLIB = -lXext
-+
-+LINTEXTENSION = $(XEXTLIBSRC)/llib-Xext.ln
-+
-+LINTEXTENSIONLIB = $(LINTEXTENSION)
-+ DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
-+ XLIB = $(EXTENSIONLIB) $(XONLYLIB)
-+ LINTXLIB = $(LINTXONLYLIB)
-+
-+ XSSLIBSRC = $(LIBSRC)/Xss
-+
-+DEPXSSLIB = $(TOP)/exports/lib/libXss.a
-+XSSLIB = -lXss
-+
-+LINTXSS = $(XSSLIBSRC)/llib-Xss.ln
-+
-+ XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
-+
-+DEPXXF86MISCLIB = $(TOP)/exports/lib/libXxf86misc.a
-+XXF86MISCLIB = -lXxf86misc
-+
-+LINTXXF86MISC = $(XXF86MISCLIBSRC)/llib-Xxf86misc.ln
-+
-+ XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
-+
-+DEPXXF86VMLIB = $(TOP)/exports/lib/libXxf86vm.a
-+XXF86VMLIB = -lXxf86vm
-+
-+LINTXXF86VM = $(XXF86VMLIBSRC)/llib-Xxf86vm.ln
-+
-+ XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
-+
-+DEPXXF86DGALIB = $(TOP)/exports/lib/libXxf86dga.a
-+XXF86DGALIB = -lXxf86dga
-+
-+LINTXXF86DGA = $(XXF86DGALIBSRC)/llib-Xxf86dga.ln
-+
-+ XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
-+
-+DEPXXF86RUSHLIB = $(TOP)/exports/lib/libXxf86rush.a
-+XXF86RUSHLIB = -lXxf86rush
-+
-+LINTXXF86RUSH = $(XXF86RUSHLIBSRC)/llib-Xxf86rush.ln
-+
-+ XVLIBSRC = $(LIBSRC)/Xv
-+
-+DEPXVLIB = $(TOP)/exports/lib/libXv.a
-+XVLIB = -lXv
-+
-+LINTXV = $(XVLIBSRC)/llib-Xv.ln
-+
-+ DPSLIBSRC = $(LIBSRC)/dps
-+
-+SODPSREV = 1.0
-+DEPDPSLIB =
-+DPSLIB = -ldps
-+
-+LINTDPS = $(DPSLIBSRC)/llib-dps.ln
-+
-+ DPSTKLIBSRC = $(LIBSRC)/dpstk
-+
-+SODPSTKREV = 1.0
-+DEPDPSTKLIB =
-+DPSTKLIB = -ldpstk
-+
-+LINTDPSTK = $(DPSTKLIBSRC)/llib-dpstk.ln
-+
-+ PSRESLIBSRC = $(LIBSRC)/psres
-+
-+SOPSRESREV = 1.0
-+DEPPSRESLIB =
-+PSRESLIB = -lpsres
-+
-+LINTPSRES = $(PSRESLIBSRC)/llib-psres.ln
-+
-+ GLXLIBSRC = $(LIBSRC)/GL
-+
-+SOGLREV = 1.2
-+DEPGLXLIB =
-+GLXLIB = -lGL
-+
-+LINTGLX = $(GLXLIBSRC)/llib-GL.ln
-+
-+ XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
-+
-+DEPXFONTCACHELIB = $(TOP)/exports/lib/libXfontcache.a
-+XFONTCACHELIB = -lXfontcache
-+
-+LINTXFONTCACHE = $(XFONTCACHELIBSRC)/llib-Xfontcache.ln
-+
-+ XAUTHSRC = $(LIBSRC)/Xau
-+
-+DEPXAUTHLIB = $(TOP)/exports/lib/libXau.a
-+XAUTHLIB = -lXau
-+
-+LINTXAUTH = $(XAUTHSRC)/llib-Xau.ln
-+
-+ XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-+
-+DEPXDMCPLIB = $(TOP)/exports/lib/libXdmcp.a
-+XDMCPLIB = -lXdmcp
-+
-+LINTXDMCP = $(XDMCPLIBSRC)/llib-Xdmcp.ln
-+
-+ XMUSRC = $(LIBSRC)/Xmu
-+
-+SOXMUREV = 6.1
-+DEPXMULIB =
-+XMULIB = -lXmu
-+
-+LINTXMU = $(XMUSRC)/llib-Xmu.ln
-+
-+ OLDXLIBSRC = $(LIBSRC)/oldX
-+
-+DEPOLDXLIB = $(TOP)/exports/lib/liboldX.a
-+OLDXLIB = -loldX
-+
-+LINTOLDX = $(OLDXLIBSRC)/llib-oldX.ln
-+
-+ XPLIBSRC = $(LIBSRC)/Xp
-+
-+SOXPREV = 6.2
-+DEPXPLIB =
-+XPLIB = -lXp
-+
-+LINTXP = $(XPLIBSRC)/llib-Xp.ln
-+
-+ TOOLKITSRC = $(LIBSRC)/Xt
-+
-+SOXTREV = 6.0
-+DEPXTOOLONLYLIB =
-+XTOOLONLYLIB = -lXt
-+
-+LINTXTOOLONLY = $(TOOLKITSRC)/llib-Xt.ln
-+
-+ DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
-+ XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
-+ LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
-+
-+ XALIBSRC = $(LIBSRC)/Xa
-+
-+SOXAREV = 1.0
-+DEPXALIB =
-+XALIB = -lXa
-+
-+LINTXA = $(XALIBSRC)/llib-Xa.ln
-+
-+ AWIDGETSRC = $(LIBSRC)/Xaw
-+
-+SOXAWREV = 7.0
-+DEPXAWLIB =
-+XAWLIB = -lXaw
-+
-+LINTXAW = $(AWIDGETSRC)/llib-Xaw.ln
-+
-+ AWIDGET6SRC = $(LIBSRC)/Xaw6
-+
-+SOXAW6REV = 6.1
-+DEPXAW6LIB =
-+XAW6LIB = -lXaw
-+
-+LINTXAW6 = $(AWIDGET6SRC)/llib-Xaw.ln
-+
-+ XILIBSRC = $(LIBSRC)/Xi
-+
-+SOXINPUTREV = 6.0
-+DEPXILIB =
-+XILIB = -lXi
-+
-+LINTXI = $(XILIBSRC)/llib-Xi.ln
-+
-+ XTESTLIBSRC = $(LIBSRC)/Xtst
-+
-+SOXTESTREV = 6.1
-+DEPXTESTLIB =
-+XTESTLIB = -lXtst
-+
-+LINTXTEST = $(XTESTLIBSRC)/llib-Xtst.ln
-+
-+ PEXLIBSRC = $(LIBSRC)/PEX5
-+
-+SOPEXREV = 6.0
-+DEPPEXLIB =
-+PEXLIB = -lPEX5
-+
-+LINTPEX = $(PEXLIBSRC)/llib-PEX5.ln
-+
-+ XIELIBSRC = $(LIBSRC)/XIE
-+
-+SOXIEREV = 6.0
-+DEPXIELIB =
-+XIELIB = -lXIE
-+
-+LINTXIE = $(XIELIBSRC)/llib-XIE.ln
-+
-+ PHIGSLIBSRC = $(LIBSRC)/PHIGS
-+
-+DEPPHIGSLIB = $(TOP)/exports/lib/libphigs.a
-+PHIGSLIB = -lphigs
-+
-+LINTPHIGS = $(PHIGSLIBSRC)/llib-phigs.ln
-+
-+DEPXBSDLIB = $(TOP)/exports/lib/libXbsd.a
-+XBSDLIB = -lXbsd
-+
-+LINTXBSD = $(LIBSRC)/Xbsd/llib-Xbsd.ln
-+
-+ ICESRC = $(LIBSRC)/ICE
-+
-+SOICEREV = 6.3
-+DEPICELIB =
-+ICELIB = -lICE
-+
-+LINTICE = $(ICESRC)/llib-ICE.ln
-+
-+ SMSRC = $(LIBSRC)/SM
-+
-+SOSMREV = 6.0
-+DEPSMLIB =
-+SMLIB = -lSM
-+
-+LINTSM = $(SMSRC)/llib-SM.ln
-+
-+ XKEYSRC = $(LIBSRC)/Xkey
-+
-+SOXKEYREV = 6.0
-+DEPXKEYLIB =
-+XKEYLIB = -lXkey
-+
-+LINTXKEY = $(XKEYSRC)/llib-Xkey.ln
-+
-+ FSLIBSRC = $(LIBSRC)/FS
-+
-+DEPFSLIB = $(TOP)/exports/lib/libFS.a
-+FSLIB = -lFS
-+
-+LINTFS = $(FSLIBSRC)/llib-FS.ln
-+
-+ FONTLIBSRC = $(LIBSRC)/font
-+
-+SOFONTREV = 1.3
-+DEPFONTLIB =
-+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont
-+
-+LINTXFONT = $(FONTLIBSRC)/llib-Xfont.ln
-+#
-+SOFONTREV = 1.3
-+DEPXFONTLIB =
-+XFONTLIB = -lXfont
-+
-+LINTXFONT = $(FONTLIBSRC)/llib-Xfont.ln
-+
-+ FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
-+
-+DEPFONTSTUBLIB = $(TOP)/exports/lib/libfntstubs.a
-+FONTSTUBLIB = -lfntstubs
-+
-+LINTFONTSTUB = $(FONTSUBLIBSRC)/llib-fntstubs.ln
-+ DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
-+ FONTLIB = $(XFONTLIB) $(FONTSTUBLIB)
-+
-+ XPMLIBSRC = $(LIBSRC)/Xpm
-+
-+SOXPMREV = 4.11
-+DEPXPMLIB =
-+XPMLIB = -lXpm
-+
-+LINTXPM = $(XPMLIBSRC)/llib-Xpm.ln
-+
-+ XKBFILELIBSRC = $(LIBSRC)/xkbfile
-+
-+DEPXKBFILELIB = $(TOP)/exports/lib/libxkbfile.a
-+XKBFILELIB = -lxkbfile
-+
-+LINTXKBFILE = $(XKBFILELIBSRC)/llib-xkbfile.ln
-+
-+ XKBCOMPSRC = $(PROGRAMSRC)/xkbcomp
-+ XKBCOMPCMD = $(CLIENTENVSETUP) $(XBUILDBINDIR)/xkbcomp
-+
-+ XKBUILIBSRC = $(LIBSRC)/xkbui
-+
-+DEPXKBUILIB = $(TOP)/exports/lib/libxkbui.a
-+XKBUILIB = -lxkbui
-+
-+LINTXKBUI = $(XKBUILIBSRC)/llib-xkbui.ln
-+
-+ DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-+
-+ DEPLIBS1 = $(DEPLIBS)
-+ DEPLIBS2 = $(DEPLIBS)
-+ DEPLIBS3 = $(DEPLIBS)
-+ DEPLIBS4 = $(DEPLIBS)
-+ DEPLIBS5 = $(DEPLIBS)
-+ DEPLIBS6 = $(DEPLIBS)
-+ DEPLIBS7 = $(DEPLIBS)
-+ DEPLIBS8 = $(DEPLIBS)
-+ DEPLIBS9 = $(DEPLIBS)
-+ DEPLIBS10 = $(DEPLIBS)
-+
-+XMULIBONLY = -lXmu
-+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-+
-+ CONFIGDIR = $(LIBDIR)/config
-+
-+ USRLIBDIRPATH = $(USRLIBDIR)
-+ LDPRELIBS = -L$(BUILDLIBDIR)
-+ LDPOSTLIBS =
-+ TOP_INCLUDES = -I$(TOP) $(TOP_X_INCLUDES)
-+ PROJECT_DEFINES =
-+
-+CXXPROJECT_DEFINES =
-+
-+# ----------------------------------------------------------------------
-+# start of Imakefile
-+
-+# $TOG: Imakefile /main/10 1997/04/30 15:39:17 kaleb $
-+#
-+#
-+#
-+#
-+# $XFree86: xc/config/imake/Imakefile,v 3.9 1999/08/14 10:49:01 dawes Exp $
-+
-+# Some compilers generate fatal errors if an -L directory does
-+# not exist. Since BUILDLIBDIR may not exist yet suppress its use.
-+ LDPRELIB =
-+ LDPRELIBS =
-+
-+DEPLIBS =
-+
-+INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
-+CPP_PROGRAM = /lib/cpp
-+CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
-+DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
-+
-+ OBJS = imake.o
-+ SRCS = imake.c
-+
-+ PROGRAM = imake
-+
-+all:: imake
-+
-+imake: $(OBJS) $(DEPLIBS)
-+ $(RM) $@
-+ $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
-+
-+install:: imake
-+ @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \
-+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) imake $(DESTDIR)$(BINDIR)/imake
-+
-+install.man:: imake.man
-+ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
-+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) imake.man $(DESTDIR)$(MANDIR)/imake.$(MANSUFFIX)
-+
-+depend:: $(DEPEND)
-+
-+$(DEPEND):
-+ @echo "checking $@ over in $(DEPENDSRC) first..."; \
-+ cd $(DEPENDSRC) && $(MAKE); \
-+ echo "okay, continuing in $(CURRENT_DIR)"
-+
-+depend::
-+ $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-+
-+lint:
-+ $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
-+lint1:
-+ $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
-+
-+clean::
-+ $(RM) imake
-+
-+install.sdk:: imake
-+ @if [ -d $(DESTDIR)$(DRIVERSDKDIR)/config/imake ]; then set +x; \
-+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(DRIVERSDKDIR)/config/imake); fi
-+ $(INSTALL) -c $(INSTBINFLAGS) imake $(DESTDIR)$(DRIVERSDKDIR)/config/imake/imake
-+
-+bootstrapdepend:
-+
-+clean::
-+ $(RM) ccimake
-+ $(RM) -r bootstrap
-+
-+# ----------------------------------------------------------------------
-+# common rules for all Makefiles - do not edit
-+
-+.c.i:
-+ $(RM) $@
-+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
-+
-+.SUFFIXES: .s
-+
-+.c.s:
-+ $(RM) $@
-+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
-+
-+emptyrule::
-+
-+clean::
-+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
-+
-+Makefile:: imake
-+
-+Makefile::
-+ -@if [ -f Makefile ]; then set -x; \
-+ $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
-+ else exit 0; fi
-+ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-+
-+tags::
-+ $(TAGS) -w *.[ch]
-+ $(TAGS) -xw *.[ch] > TAGS
-+
-+man_keywords::
-+
-+# ----------------------------------------------------------------------
-+# empty rules for directories that do not have SUBDIRS - do not edit
-+
-+install::
-+ @echo "install in $(CURRENT_DIR) done"
-+
-+install.man::
-+ @echo "install.man in $(CURRENT_DIR) done"
-+
-+install.sdk::
-+ @echo "install.sdk in $(CURRENT_DIR) done"
-+
-+Makefiles::
-+
-+includes::
-+
-+depend::
-+
-+# ----------------------------------------------------------------------
-+# dependencies generated by makedepend
-+
diff -urN XFree86-4.0.orig/xc/config/imake/imake.c XFree86-4.0/xc/config/imake/imake.c
--- XFree86-4.0.orig/xc/config/imake/imake.c Wed Dec 29 01:54:48 1999
+++ XFree86-4.0/xc/config/imake/imake.c Fri Mar 17 02:19:49 2000
return;
}
/* what's the definitive way to tell what any particular distribution is? */
-diff -urN XFree86-4.0.orig/xc/config/makedepend/Makefile.proto XFree86-4.0/xc/config/makedepend/Makefile.proto
---- XFree86-4.0.orig/xc/config/makedepend/Makefile.proto Thu Jan 1 01:00:00 1970
-+++ XFree86-4.0/xc/config/makedepend/Makefile.proto Fri Mar 17 02:19:49 2000
-@@ -0,0 +1,890 @@
-+# Makefile generated by imake - do not edit!
-+# $TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $
-+
-+# ----------------------------------------------------------------------
-+# Makefile generated from "Imake.tmpl" and <./config/makedepend/Imakefile>
-+# $TOG: Imake.tmpl /main/249 1997/10/13 15:28:56 kaleb $
-+#
-+#
-+#
-+#
-+# $XFree86: xc/config/cf/Imake.tmpl,v 3.65 2000/01/31 19:33:18 dawes Exp $
-+# ----------------------------------------------------------------------
-+
-+all::
-+
-+.SUFFIXES: .i
-+
-+# $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
-+
-+# $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
-+
-+# -----------------------------------------------------------------------
-+# site-specific configuration parameters that need to come before
-+# the platform-specific parameters - edit site.def to change
-+
-+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-+
-+# site: $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Exp $
-+
-+# $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
-+
-+# ----------------------------------------------------------------------
-+# platform-specific configuration parameters - edit linux.cf to change
-+
-+# platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
-+# platform: $XFree86: xc/config/cf/linux.cf,v 3.115 2000/02/21 18:05:31 dawes Exp $
-+
-+# operating system: Linux 2.2.14 i586 [ELF] (2.2.14)
-+# libc: (6.1.2)
-+# binutils: (29)
-+
-+# $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $
-+# $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $
-+
-+# $XFree86: xc/config/cf/xfree86.cf,v 3.269 2000/02/17 13:50:02 dawes Exp $
-+
-+# $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
-+
-+AFB_DEFS = -DUSE_AFB
-+
-+DRIVERSDKDIR = $(USRLIBDIR)/Server
-+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
-+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
-+
-+ XF86SRC = $(SERVERSRC)/hw/xfree86
-+ XF86ACCELSRC = $(XF86SRC)/accel
-+ XF86COMSRC = $(XF86SRC)/common
-+ XF86PARSERSRC = $(XF86SRC)/parser
-+ XF86OSSRC = $(XF86SRC)/os-support
-+ XF86DRIVERSRC = $(XF86SRC)/drivers
-+ DRIVERSRC = $(XF86DRIVERSRC)
-+ S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
-+ S3VDRIVERSRC = $(XF86SRC)/accel/s3_virge/drivers
-+
-+ XF68SRC = $(SERVERSRC)/hw/xfree68
-+ XF68COMSRC = $(XF68SRC)/common
-+ XF68PARSERSRC = $(XF68SRC)/parser
-+ XF68OSSRC = $(XF68SRC)/os-support
-+
-+ XF98SRC = $(SERVERSRC)/hw/xfree98
-+ XF98ACCELSRC = $(XF98SRC)/accel
-+ XF98COMSRC = $(XF98SRC)/common
-+ XF98OSSRC = $(XF98SRC)/os-support
-+ XF98DRIVERSRC = $(XF98SRC)/drivers
-+ XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers
-+XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers
-+ XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers
-+ XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers
-+XF98NECS3DRIVERSRC = $(XF98SRC)/accel/s3nec/drivers
-+XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers
-+ XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers
-+XF98GA968DRIVERSRC = $(XF98SRC)/accel/s3ga968/drivers
-+
-+ XFREE86DOCDIR = $(DOCDIR)
-+ XFREE86PSDOCDIR = $(DOCPSDIR)
-+ XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
-+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
-+
-+# $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
-+# $XFree86: xc/config/cf/xf86.rules,v 3.30 1999/10/13 16:49:02 dawes Exp $
-+
-+# ----------------------------------------------------------------------
-+# site-specific configuration parameters that go after
-+# the platform-specific parameters - edit site.def to change
-+
-+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-+
-+# site: $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Exp $
-+
-+# ---------------------------------------------------------------------
-+# Imake rules for building libraries, programs, scripts, and data files
-+# rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
-+#
-+#
-+#
-+#
-+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.64 2000/02/13 06:15:16 dawes Exp $
-+
-+ _NULLCMD_ = @ echo -n
-+
-+GLIDEINCDIR =
-+
-+TKLIBNAME =
-+
-+TKLIBDIR =
-+
-+TCLLIBNAME =
-+
-+TCLIBDIR =
-+
-+ PATHSEP = /
-+ SHELL = /bin/sh
-+
-+ TOP = ../..
-+ CURRENT_DIR = ./config/makedepend
-+
-+ IMAKE = $(IMAKESRC)/imake
-+ DEPEND = $(DEPENDSRC)/makedepend
-+ MKDIRHIER = mkdir -p
-+ REVPATH = $(CONFIGSRC)/util/revpath
-+ EXPORTLISTGEN =
-+ CONFIGSRC = $(TOP)/config
-+ IMAKESRC = $(CONFIGSRC)/imake
-+ DEPENDSRC = $(CONFIGSRC)/makedepend
-+
-+ INCROOT = /usr/X11R6/include
-+ USRLIBDIR = /usr/X11R6/lib
-+ VARLIBDIR = /var/lib
-+ SHLIBDIR = /usr/X11R6/lib
-+ LINTLIBDIR = $(USRLIBDIR)/lint
-+ MANPATH = /usr/X11R6/man
-+ MANSOURCEPATH = $(MANPATH)/man
-+ MANDIR = $(MANSOURCEPATH)1
-+ LIBMANDIR = $(MANSOURCEPATH)3
-+ FILEMANDIR = $(MANSOURCEPATH)5
-+ MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX)
-+ DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
-+ LOGDIRECTORY = /var/log
-+
-+ VARRUNDIR = /var/run
-+
-+ VARDBDIR = /var/state
-+
-+ AR = ar clq
-+ BOOTSTRAPCFLAGS =
-+ CC = gcc
-+ AS = as
-+
-+.SUFFIXES: .cc
-+
-+ CXX = c++
-+ CXXFILT = c++filt
-+ CXXLIB =
-+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce
-+CXXDEPENDINCLUDES =
-+ CXXEXTRA_DEFINES =
-+CXXEXTRA_INCLUDES =
-+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE $(CXXPROJECT_DEFINES)
-+ CXXOPTIONS =
-+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
-+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
-+ CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
-+
-+ COMPRESS = compress
-+ GZIPCMD = gzip
-+ CPP = /lib/cpp $(STD_CPP_DEFINES)
-+ RAWCPP = /lib/cpp -undef $(STD_CPP_OPTIONS)
-+ PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
-+ INSTALL = install
-+ INSTALLFLAGS = -c
-+ LD = ld
-+ LEX = flex -l
-+ LEXLIB = -lfl
-+ YACC = bison -y
-+ CCYACC = bison -y
-+ LINT = lint
-+ LINTLIBFLAG = -C
-+ LINTOPTS = -axz
-+ LN = ln -s
-+ MAKE = make
-+ MV = mv -f
-+ CP = cp
-+
-+ RANLIB = ranlib
-+ RANLIBINSTFLAGS =
-+
-+ RM = rm -f
-+ MANSUFFIX = 1x
-+ LIBMANSUFFIX = 3x
-+ FILEMANSUFFIX = 5x
-+ MISCMANSUFFIX = 7
-+ DRIVERMANSUFFIX = 4
-+ MANDEFS = -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX)
-+
-+ TROFF = groff -Tps
-+ NROFF = nroff
-+ MSMACROS = -ms
-+ MANMACROS = -man
-+ TBL = tbl
-+ EQN = eqn
-+ NEQN = neqn
-+ COL = col
-+ COLFLAGS = -b
-+ MODCC = gcc
-+ MODCPP = /lib/cpp
-+ MODCFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREAD_CFLAGS) $(ALLDEFINES)
-+ MODAS = as
-+ MODASFLAGS =
-+ MODLD = ld
-+ MODLDFLAGS =
-+MODLDCOMBINEFLAGS = -r
-+ MODAR = ar clq
-+ MODRANLIB =
-+
-+ DVIPS = dvips
-+ LATEX = latex
-+
-+ STD_INCLUDES =
-+ STD_CPP_OPTIONS = -traditional
-+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE $(PROJECT_DEFINES)
-+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE $(PROJECT_DEFINES)
-+ EXTRA_LOAD_FLAGS = -Wl,-rpath-link,$(BUILDLIBDIR)
-+ EXTRA_LDOPTIONS =
-+ EXTRA_LIBRARIES =
-+ TAGS = ctags
-+
-+ PARALLELMFLAGS =
-+
-+ SHAREDCODEDEF =
-+ SHLIBDEF =
-+
-+ SHLIBLDFLAGS = -shared
-+
-+ PICFLAGS = -fPIC
-+
-+ CXXPICFLAGS = -fPIC
-+
-+ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
-+
-+ INSTPGMFLAGS = -s
-+
-+ INSTBINFLAGS = -m 0755
-+ INSTUIDFLAGS = -m 4711
-+ INSTLIBFLAGS = -m 0644
-+ INSTINCFLAGS = -m 0444
-+ INSTMANFLAGS = -m 0444
-+ INSTDATFLAGS = -m 0444
-+ INSTKMEMFLAGS = -m 4711
-+
-+ PROJECTROOT = /usr/X11R6
-+
-+ CDEBUGFLAGS = -O2 -fno-strength-reduce
-+ CCOPTIONS = -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
-+
-+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-+ LDPRELIB = -L$(BUILDLIBDIR)
-+ LDPOSTLIB =
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+
-+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-+
-+ CCLINK = $(CC)
-+
-+ CXXLINK = $(CXX)
-+
-+ LDSTRIPFLAGS = -x
-+ LDCOMBINEFLAGS = -r
-+ DEPENDFLAGS =
-+
-+# Not sure this belongs here
-+ TKLIBDIR =
-+ TKINCDIR =
-+ TKLIBNAME =
-+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
-+ TCLLIBDIR =
-+ TCLINCDIR =
-+ TCLLIBNAME =
-+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
-+
-+ MACROFILE = linux.cf
-+ RM_CMD = $(RM)
-+
-+ IMAKE_DEFINES =
-+
-+ IRULESRC = $(CONFIGSRC)/cf
-+ IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
-+
-+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
-+
-+# $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $
-+
-+# $XFree86: xc/config/cf/X11.rules,v 1.4 1997/09/09 11:56:20 hohndel Exp $
-+
-+# ----------------------------------------------------------------------
-+# X Window System Build Parameters and Rules
-+# $TOG: X11.tmpl /main/308 1998/06/16 15:14:24 msr $
-+#
-+#
-+#
-+#
-+# $XFree86: xc/config/cf/X11.tmpl,v 1.59 2000/02/18 16:23:07 dawes Exp $
-+
-+STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
-+
-+FCHOWN_DEFINES = -DHAS_FCHOWN
-+
-+# -----------------------------------------------------------------------
-+# X Window System make variables; these need to be coordinated with rules
-+
-+ XTOP = $(TOP)
-+ BINDIR = /usr/X11R6/bin
-+ BUILDINCROOT = $(TOP)/exports
-+ BUILDINCDIR = $(BUILDINCROOT)/include
-+ BUILDINCTOP = ../..
-+ BUILDLIBDIR = $(TOP)/exports/lib
-+ BUILDLIBTOP = ../..
-+ BUILDBINDIR = $(TOP)/exports/bin
-+ BUILDBINTOP = ../..
-+ BUILDMODULEDIR = $(BUILDLIBDIR)/modules
-+ BUILDMODULETOP = $(BUILDLIBTOP)/..
-+ XBUILDINCROOT = $(XTOP)/exports
-+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
-+ XBUILDINCTOP = ../../..
-+ XBUILDBINDIR = $(XBUILDINCROOT)/bin
-+ INCDIR = $(INCROOT)
-+ ADMDIR = /usr/adm
-+ LIBDIR = $(USRLIBDIR)/X11
-+ LIBEXECDIR = /usr/X11R6/libexec
-+ MODULEDIR = $(USRLIBDIR)/modules
-+ TOP_X_INCLUDES = -I$(TOP)/exports/include
-+
-+ VARDIR = /var/X11
-+
-+ ETCX11DIR = /etc/X11
-+
-+ CONFDIR = $(ETCX11DIR)
-+
-+ DOCDIR = $(LIBDIR)/doc
-+ DOCHTMLDIR = $(DOCDIR)/html
-+ DOCPSDIR = $(DOCDIR)/PostScript
-+ FONTDIR = $(LIBDIR)/fonts
-+ ENCODINGSDIR = $(FONTDIR)/encodings
-+ XINITDIR = $(LIBDIR)/xinit
-+ XDMDIR = $(LIBDIR)/xdm
-+ XDMVARDIR = $(VARLIBDIR)/xdm
-+ TWMDIR = $(LIBDIR)/twm
-+ XSMDIR = $(LIBDIR)/xsm
-+ NLSDIR = $(LIBDIR)/nls
-+ XLOCALEDIR = $(LIBDIR)/locale
-+ PEXAPIDIR = $(LIBDIR)/PEX
-+ LBXPROXYDIR = $(LIBDIR)/lbxproxy
-+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr
-+ XPRINTDIR = $(LIBDIR)/xserver
-+ XAPPLOADDIR = $(LIBDIR)/app-defaults
-+ FONTCFLAGS = -t
-+
-+ INSTAPPFLAGS = $(INSTDATFLAGS)
-+
-+ RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
-+ FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
-+ MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
-+
-+ DOCUTILSRC = $(XTOP)/doc/util
-+ CLIENTSRC = $(TOP)/clients
-+ DEMOSRC = $(TOP)/demos
-+ XDOCMACROS = $(DOCUTILSRC)/macros.t
-+ XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
-+ PROGRAMSRC = $(TOP)/programs
-+ LIBSRC = $(XTOP)/lib
-+ FONTSRC = $(XTOP)/fonts
-+ ENCODINGSSRC = $(FONTSRC)/encodings
-+ INCLUDESRC = $(BUILDINCROOT)/include
-+ XINCLUDESRC = $(INCLUDESRC)/X11
-+ SERVERSRC = $(XTOP)/programs/Xserver
-+ CONTRIBSRC = $(XTOP)/../contrib
-+ UNSUPPORTEDSRC = $(XTOP)/unsupported
-+ DOCSRC = $(XTOP)/doc
-+ RGBSRC = $(XTOP)/programs/rgb
-+ BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
-+ MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-+ FONTSERVERSRC = $(PROGRAMSRC)/xfs
-+ FONTINCSRC = $(XTOP)/include/fonts
-+ EXTINCSRC = $(XTOP)/include/extensions
-+ FTSOURCEDIR = $(TOP)/extras/FreeType
-+ XTTSOURCEDIR = $(TOP)/extras/X-TrueType
-+ TRANSCOMMSRC = $(LIBSRC)/xtrans
-+ TRANS_INCLUDES = -I$(TRANSCOMMSRC)
-+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
-+
-+ XENVLIBDIR = $(TOP)/exports/lib
-+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
-+
-+# $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $
-+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.12 1999/06/27 14:07:17 dawes Exp $
-+
-+ XLIBSRC = $(LIBSRC)/X11
-+
-+SOXLIBREV = 6.1
-+DEPXONLYLIB =
-+XONLYLIB = -lX11
-+
-+LINTXONLY = $(XLIBSRC)/llib-X11.ln
-+
-+ XLIBONLY = $(XONLYLIB)
-+
-+ XEXTLIBSRC = $(LIBSRC)/Xext
-+
-+SOXEXTREV = 6.4
-+DEPEXTENSIONLIB =
-+EXTENSIONLIB = -lXext
-+
-+LINTEXTENSION = $(XEXTLIBSRC)/llib-Xext.ln
-+
-+LINTEXTENSIONLIB = $(LINTEXTENSION)
-+ DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
-+ XLIB = $(EXTENSIONLIB) $(XONLYLIB)
-+ LINTXLIB = $(LINTXONLYLIB)
-+
-+ XSSLIBSRC = $(LIBSRC)/Xss
-+
-+DEPXSSLIB = $(TOP)/exports/lib/libXss.a
-+XSSLIB = -lXss
-+
-+LINTXSS = $(XSSLIBSRC)/llib-Xss.ln
-+
-+ XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
-+
-+DEPXXF86MISCLIB = $(TOP)/exports/lib/libXxf86misc.a
-+XXF86MISCLIB = -lXxf86misc
-+
-+LINTXXF86MISC = $(XXF86MISCLIBSRC)/llib-Xxf86misc.ln
-+
-+ XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
-+
-+DEPXXF86VMLIB = $(TOP)/exports/lib/libXxf86vm.a
-+XXF86VMLIB = -lXxf86vm
-+
-+LINTXXF86VM = $(XXF86VMLIBSRC)/llib-Xxf86vm.ln
-+
-+ XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
-+
-+DEPXXF86DGALIB = $(TOP)/exports/lib/libXxf86dga.a
-+XXF86DGALIB = -lXxf86dga
-+
-+LINTXXF86DGA = $(XXF86DGALIBSRC)/llib-Xxf86dga.ln
-+
-+ XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
-+
-+DEPXXF86RUSHLIB = $(TOP)/exports/lib/libXxf86rush.a
-+XXF86RUSHLIB = -lXxf86rush
-+
-+LINTXXF86RUSH = $(XXF86RUSHLIBSRC)/llib-Xxf86rush.ln
-+
-+ XVLIBSRC = $(LIBSRC)/Xv
-+
-+DEPXVLIB = $(TOP)/exports/lib/libXv.a
-+XVLIB = -lXv
-+
-+LINTXV = $(XVLIBSRC)/llib-Xv.ln
-+
-+ DPSLIBSRC = $(LIBSRC)/dps
-+
-+SODPSREV = 1.0
-+DEPDPSLIB =
-+DPSLIB = -ldps
-+
-+LINTDPS = $(DPSLIBSRC)/llib-dps.ln
-+
-+ DPSTKLIBSRC = $(LIBSRC)/dpstk
-+
-+SODPSTKREV = 1.0
-+DEPDPSTKLIB =
-+DPSTKLIB = -ldpstk
-+
-+LINTDPSTK = $(DPSTKLIBSRC)/llib-dpstk.ln
-+
-+ PSRESLIBSRC = $(LIBSRC)/psres
-+
-+SOPSRESREV = 1.0
-+DEPPSRESLIB =
-+PSRESLIB = -lpsres
-+
-+LINTPSRES = $(PSRESLIBSRC)/llib-psres.ln
-+
-+ GLXLIBSRC = $(LIBSRC)/GL
-+
-+SOGLREV = 1.2
-+DEPGLXLIB =
-+GLXLIB = -lGL
-+
-+LINTGLX = $(GLXLIBSRC)/llib-GL.ln
-+
-+ XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
-+
-+DEPXFONTCACHELIB = $(TOP)/exports/lib/libXfontcache.a
-+XFONTCACHELIB = -lXfontcache
-+
-+LINTXFONTCACHE = $(XFONTCACHELIBSRC)/llib-Xfontcache.ln
-+
-+ XAUTHSRC = $(LIBSRC)/Xau
-+
-+DEPXAUTHLIB = $(TOP)/exports/lib/libXau.a
-+XAUTHLIB = -lXau
-+
-+LINTXAUTH = $(XAUTHSRC)/llib-Xau.ln
-+
-+ XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-+
-+DEPXDMCPLIB = $(TOP)/exports/lib/libXdmcp.a
-+XDMCPLIB = -lXdmcp
-+
-+LINTXDMCP = $(XDMCPLIBSRC)/llib-Xdmcp.ln
-+
-+ XMUSRC = $(LIBSRC)/Xmu
-+
-+SOXMUREV = 6.1
-+DEPXMULIB =
-+XMULIB = -lXmu
-+
-+LINTXMU = $(XMUSRC)/llib-Xmu.ln
-+
-+ OLDXLIBSRC = $(LIBSRC)/oldX
-+
-+DEPOLDXLIB = $(TOP)/exports/lib/liboldX.a
-+OLDXLIB = -loldX
-+
-+LINTOLDX = $(OLDXLIBSRC)/llib-oldX.ln
-+
-+ XPLIBSRC = $(LIBSRC)/Xp
-+
-+SOXPREV = 6.2
-+DEPXPLIB =
-+XPLIB = -lXp
-+
-+LINTXP = $(XPLIBSRC)/llib-Xp.ln
-+
-+ TOOLKITSRC = $(LIBSRC)/Xt
-+
-+SOXTREV = 6.0
-+DEPXTOOLONLYLIB =
-+XTOOLONLYLIB = -lXt
-+
-+LINTXTOOLONLY = $(TOOLKITSRC)/llib-Xt.ln
-+
-+ DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
-+ XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
-+ LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
-+
-+ XALIBSRC = $(LIBSRC)/Xa
-+
-+SOXAREV = 1.0
-+DEPXALIB =
-+XALIB = -lXa
-+
-+LINTXA = $(XALIBSRC)/llib-Xa.ln
-+
-+ AWIDGETSRC = $(LIBSRC)/Xaw
-+
-+SOXAWREV = 7.0
-+DEPXAWLIB =
-+XAWLIB = -lXaw
-+
-+LINTXAW = $(AWIDGETSRC)/llib-Xaw.ln
-+
-+ AWIDGET6SRC = $(LIBSRC)/Xaw6
-+
-+SOXAW6REV = 6.1
-+DEPXAW6LIB =
-+XAW6LIB = -lXaw
-+
-+LINTXAW6 = $(AWIDGET6SRC)/llib-Xaw.ln
-+
-+ XILIBSRC = $(LIBSRC)/Xi
-+
-+SOXINPUTREV = 6.0
-+DEPXILIB =
-+XILIB = -lXi
-+
-+LINTXI = $(XILIBSRC)/llib-Xi.ln
-+
-+ XTESTLIBSRC = $(LIBSRC)/Xtst
-+
-+SOXTESTREV = 6.1
-+DEPXTESTLIB =
-+XTESTLIB = -lXtst
-+
-+LINTXTEST = $(XTESTLIBSRC)/llib-Xtst.ln
-+
-+ PEXLIBSRC = $(LIBSRC)/PEX5
-+
-+SOPEXREV = 6.0
-+DEPPEXLIB =
-+PEXLIB = -lPEX5
-+
-+LINTPEX = $(PEXLIBSRC)/llib-PEX5.ln
-+
-+ XIELIBSRC = $(LIBSRC)/XIE
-+
-+SOXIEREV = 6.0
-+DEPXIELIB =
-+XIELIB = -lXIE
-+
-+LINTXIE = $(XIELIBSRC)/llib-XIE.ln
-+
-+ PHIGSLIBSRC = $(LIBSRC)/PHIGS
-+
-+DEPPHIGSLIB = $(TOP)/exports/lib/libphigs.a
-+PHIGSLIB = -lphigs
-+
-+LINTPHIGS = $(PHIGSLIBSRC)/llib-phigs.ln
-+
-+DEPXBSDLIB = $(TOP)/exports/lib/libXbsd.a
-+XBSDLIB = -lXbsd
-+
-+LINTXBSD = $(LIBSRC)/Xbsd/llib-Xbsd.ln
-+
-+ ICESRC = $(LIBSRC)/ICE
-+
-+SOICEREV = 6.3
-+DEPICELIB =
-+ICELIB = -lICE
-+
-+LINTICE = $(ICESRC)/llib-ICE.ln
-+
-+ SMSRC = $(LIBSRC)/SM
-+
-+SOSMREV = 6.0
-+DEPSMLIB =
-+SMLIB = -lSM
-+
-+LINTSM = $(SMSRC)/llib-SM.ln
-+
-+ XKEYSRC = $(LIBSRC)/Xkey
-+
-+SOXKEYREV = 6.0
-+DEPXKEYLIB =
-+XKEYLIB = -lXkey
-+
-+LINTXKEY = $(XKEYSRC)/llib-Xkey.ln
-+
-+ FSLIBSRC = $(LIBSRC)/FS
-+
-+DEPFSLIB = $(TOP)/exports/lib/libFS.a
-+FSLIB = -lFS
-+
-+LINTFS = $(FSLIBSRC)/llib-FS.ln
-+
-+ FONTLIBSRC = $(LIBSRC)/font
-+
-+SOFONTREV = 1.3
-+DEPFONTLIB =
-+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont
-+
-+LINTXFONT = $(FONTLIBSRC)/llib-Xfont.ln
-+#
-+SOFONTREV = 1.3
-+DEPXFONTLIB =
-+XFONTLIB = -lXfont
-+
-+LINTXFONT = $(FONTLIBSRC)/llib-Xfont.ln
-+
-+ FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
-+
-+DEPFONTSTUBLIB = $(TOP)/exports/lib/libfntstubs.a
-+FONTSTUBLIB = -lfntstubs
-+
-+LINTFONTSTUB = $(FONTSUBLIBSRC)/llib-fntstubs.ln
-+ DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
-+ FONTLIB = $(XFONTLIB) $(FONTSTUBLIB)
-+
-+ XPMLIBSRC = $(LIBSRC)/Xpm
-+
-+SOXPMREV = 4.11
-+DEPXPMLIB =
-+XPMLIB = -lXpm
-+
-+LINTXPM = $(XPMLIBSRC)/llib-Xpm.ln
-+
-+ XKBFILELIBSRC = $(LIBSRC)/xkbfile
-+
-+DEPXKBFILELIB = $(TOP)/exports/lib/libxkbfile.a
-+XKBFILELIB = -lxkbfile
-+
-+LINTXKBFILE = $(XKBFILELIBSRC)/llib-xkbfile.ln
-+
-+ XKBCOMPSRC = $(PROGRAMSRC)/xkbcomp
-+ XKBCOMPCMD = $(CLIENTENVSETUP) $(XBUILDBINDIR)/xkbcomp
-+
-+ XKBUILIBSRC = $(LIBSRC)/xkbui
-+
-+DEPXKBUILIB = $(TOP)/exports/lib/libxkbui.a
-+XKBUILIB = -lxkbui
-+
-+LINTXKBUI = $(XKBUILIBSRC)/llib-xkbui.ln
-+
-+ DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-+
-+ DEPLIBS1 = $(DEPLIBS)
-+ DEPLIBS2 = $(DEPLIBS)
-+ DEPLIBS3 = $(DEPLIBS)
-+ DEPLIBS4 = $(DEPLIBS)
-+ DEPLIBS5 = $(DEPLIBS)
-+ DEPLIBS6 = $(DEPLIBS)
-+ DEPLIBS7 = $(DEPLIBS)
-+ DEPLIBS8 = $(DEPLIBS)
-+ DEPLIBS9 = $(DEPLIBS)
-+ DEPLIBS10 = $(DEPLIBS)
-+
-+XMULIBONLY = -lXmu
-+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-+
-+ CONFIGDIR = $(LIBDIR)/config
-+
-+ USRLIBDIRPATH = $(USRLIBDIR)
-+ LDPRELIBS = -L$(BUILDLIBDIR)
-+ LDPOSTLIBS =
-+ TOP_INCLUDES = -I$(TOP) $(TOP_X_INCLUDES)
-+ PROJECT_DEFINES =
-+
-+CXXPROJECT_DEFINES =
-+
-+# ----------------------------------------------------------------------
-+# start of Imakefile
-+
-+# $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
-+#
-+#
-+#
-+#
-+# $XFree86: xc/config/makedepend/Imakefile,v 3.7 1999/08/14 10:49:02 dawes Exp $
-+
-+ SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c
-+ OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o
-+
-+# Some compilers generate fatal errors if an -L directory does
-+# not exist. Since BUILDLIBDIR may not exist yet suppress its use.
-+ LDPRELIB =
-+ LDPRELIBS =
-+
-+PREINCDIR = /usr/local/lib/gcc-include
-+PREINC_DEFINES = -DPREINCDIR=\"$(PREINCDIR)\"
-+
-+STDINCDIR = /usr/include
-+STDINC_DEFINES = -DINCLUDEDIR=\"$(STDINCDIR)\"
-+
-+POSTINCDIR = /usr/lib/gcc-lib/i586-pld-linux/2.95.2/include
-+POSTINC_DEFINES = -DPOSTINCDIR=\"$(POSTINCDIR)\"
-+
-+INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES)
-+OSUF = .o
-+OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
-+MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
-+INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
-+
-+ DEPLIBS =
-+
-+all:: makedepend
-+
-+bootstrap:
-+
-+clean::
-+ $(RM) Makefile.proto
-+
-+ PROGRAM = makedepend
-+
-+all:: makedepend
-+
-+makedepend: $(OBJS) $(DEPLIBS)
-+ $(RM) $@
-+ $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
-+
-+install:: makedepend
-+ @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \
-+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) makedepend $(DESTDIR)$(BINDIR)/makedepend
-+
-+depend:: $(DEPEND)
-+
-+$(DEPEND):
-+ @echo "checking $@ over in $(DEPENDSRC) first..."; \
-+ cd $(DEPENDSRC) && $(MAKE); \
-+ echo "okay, continuing in $(CURRENT_DIR)"
-+
-+depend::
-+ $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-+
-+lint:
-+ $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
-+lint1:
-+ $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
-+
-+clean::
-+ $(RM) makedepend
-+
-+main.o: main.c $(ICONFIGFILES)
-+ $(RM) $@
-+ $(CC) -c $(CFLAGS) $(MAIN_DEFINES) $*.c
-+
-+main.i: main.c $(ICONFIGFILES)
-+ $(RM) $@
-+ $(CC) -E $(CFLAGS) $(MAIN_DEFINES) main.c > $@
-+
-+main.s: main.c $(ICONFIGFILES)
-+ $(RM) $@
-+ $(CC) -S $(CFLAGS) $(MAIN_DEFINES) $*.c
-+
-+install.man:: mkdepend.man
-+ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
-+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) mkdepend.man $(DESTDIR)$(MANDIR)/makedepend.$(MANSUFFIX)
-+
-+install.sdk:: makedepend
-+ @if [ -d $(DESTDIR)$(DRIVERSDKDIR)/config/makedepend ]; then set +x; \
-+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(DRIVERSDKDIR)/config/makedepend); fi
-+ $(INSTALL) -c $(INSTBINFLAGS) makedepend $(DESTDIR)$(DRIVERSDKDIR)/config/makedepend/makedepend
-+
-+# ----------------------------------------------------------------------
-+# common rules for all Makefiles - do not edit
-+
-+.c.i:
-+ $(RM) $@
-+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
-+
-+.SUFFIXES: .s
-+
-+.c.s:
-+ $(RM) $@
-+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
-+
-+emptyrule::
-+
-+clean::
-+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
-+
-+Makefile:: $(IMAKE)
-+
-+$(IMAKE) $(IMAKE).o:
-+ -@(cd $(IMAKESRC) && if [ -f Makefile ]; then \
-+ echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \
-+ echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \
-+ $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \
-+ echo "okay, continuing in $(CURRENT_DIR)")
-+
-+Makefile::
-+ -@if [ -f Makefile ]; then set -x; \
-+ $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
-+ else exit 0; fi
-+ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-+
-+tags::
-+ $(TAGS) -w *.[ch]
-+ $(TAGS) -xw *.[ch] > TAGS
-+
-+man_keywords::
-+
-+# ----------------------------------------------------------------------
-+# empty rules for directories that do not have SUBDIRS - do not edit
-+
-+install::
-+ @echo "install in $(CURRENT_DIR) done"
-+
-+install.man::
-+ @echo "install.man in $(CURRENT_DIR) done"
-+
-+install.sdk::
-+ @echo "install.sdk in $(CURRENT_DIR) done"
-+
-+Makefiles::
-+
-+includes::
-+
-+depend::
-+
-+# ----------------------------------------------------------------------
-+# dependencies generated by makedepend
-+
diff -urN XFree86-4.0.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-4.0/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile
--- XFree86-4.0.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Sep 6 15:23:12 1999
+++ XFree86-4.0/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Fri Mar 17 02:19:49 2000
#endif
#ifndef X_NOT_POSIX
+--- XFree86-4.0/xc/config/cf/linux.cf~ Mon May 1 20:18:57 2000
++++ XFree86-4.0/xc/config/cf/linux.cf Mon May 1 22:39:02 2000
+@@ -412,7 +412,7 @@
+ #define StandardCppDefines StandardDefines
+
+ #define HasVarRun YES
+-#define VarDbDirectory /var/state
++#define VarDbDirectory /var/lib
+
+ #ifndef XF86ExtraCardDrivers
+ #define XF86ExtraCardDrivers v4l
projects / packages / XFree86.git / commitdiff