Commit 7bf7bda7 authored by dawes's avatar dawes
Browse files

Import of XFree86 4.0.99.1

parent 856c9670
......@@ -7,7 +7,7 @@
Building and Installing X11R6.4
Building and Installing X11R6.5.1
......@@ -17,14 +17,12 @@
Kaleb S. KEITHLEY
The Open Group X Project Team
30 January, 1998
August 20, 2000
......@@ -32,40 +30,48 @@
Copyright (C) 1999,2000 Compaq Computer Corporation
Copyright (C) 1999,2000 Hewlett-Packard Company
Copyright (C) 1999,2000 IBM Corporation
Copyright (C) 1999,2000 Hummingbird Communications Ltd.
Copyright (C) 1999,2000 Silicon Graphics, Inc.
Copyright (C) 1999,2000 Sun Microsystems, Inc.
Copyright (C) 1999,2000 The Open Group
Copyright (C) 1998 The Open Group
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the Software),
to use the Software without restriction, including, without limitation,
the rights to copy, modify, merge, publish, distribute and sublicense
the Software, to make, have made, license and distribute derivative
works thereof, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and the following permission notice shall be
included in all copies of the Software:
THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABIL-
ITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- INFRINGEMENT. IN NO EVENT
SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER USEABILI-
TIY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF, OR IN CONNNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS
IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not
be used in advertising or otherwise to promote the use or other dealings
in this Software without prior written authorization from The Open
Group.
copy of this software and associated documentation files (the "Soft-
ware"), to deal in the Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish, distribute,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, provided that the above copyright
notice(s) and this permission notice appear in all copies of the Soft-
ware and that both the above copyright notice(s) and this permission
notice appear in supporting documentation.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
MANCE OF THIS SOFTWARE.
Except as contained in this notice, the name of a copyright holder shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization of
the copyright holder.
X Window System is a trademark of The Open Group.
1. Introduction
This document is the installation notes that were provided with The Open
Group's X11R6.4 release. If you're building XFree86, it can be used as
a rough guide. Be aware that most of the details are not targetted
This document is the installation notes that were provided with X.Org's
X11R6.5.1 release. If you're building XFree86, it can be used as a
rough guide. Be aware that most of the details are not targetted
specifically at the current XFree86 source tree. XFree86-specific docu-
mentation can be found in the xc/programs/Xserver/hw/xfree86/doc direc-
tory and on-line at http://www.xfree86.org/current/. Some of the docu-
......@@ -80,16 +86,17 @@ This quick summary is no substitute for reading the full build instruc-
tions later in this document.
Edit xc/config/cf/site.def for local preferences. If you want to
install somewhere other than /usr/X11R6.4, change ProjectRoot. (Do not
install somewhere other than /usr/X11R6.5.1, change ProjectRoot. (Do not
use DESTDIR.) If you want to build with gcc uncomment the HasGcc2 line.
If you have gcc, but not cc, please read the full build instructions.
If some time has elapsed since the initial release of R6.4, check to see
if any public patches have been released. The source tar files may have
been updated -- check the patch-level line in the bug-report template.
If the source in the tar files has not been updated then get all the
patches and apply them, following the instructions at the top of each
patch. Ignore the rebuild steps in the patch application instructions.
If some time has elapsed since the initial release of R6.5.1, check to
see if any public patches have been released. The source tar files may
have been updated -- check the patch-level line in the bug-report tem-
plate. If the source in the tar files has not been updated then get all
the patches and apply them, following the instructions at the top of
each patch. Ignore the rebuild steps in the patch application instruc-
tions.
Check the appropriate vendor-specific .cf file in xc/config/cf/ to make
sure that OSMajorVersion, OSMinorVersion, and OSTeenyVersion are set
......@@ -127,7 +134,7 @@ installation instructions.
3. Building and Installing R6.4
3. Building and Installing R6.5.1
Historically the MIT X Consortium and The X Consortium, Inc., sample
......@@ -171,21 +178,21 @@ On non-UNIX systems you'll need a utility that can extract gzip com-
pressed tar files to extract the sources. There are several to chose
from, we do not make recommendations about which one you should use.
Release 6.4 sources are distributed among the tar files as follows:
Release 6.5.1 sources are distributed among the tar files as follows:
tog-1.tar contains everything in xc/ that isn't in the other tar files
tog-2.tar contains xc/fonts
tog-3.tar contains xc/doc/specs, xc/util
tog-4.tar contains xc/doc/hardcopy
xorg-1.tar contains everything in xc/ that isn't in the other tar files
xorg-2.tar contains xc/fonts
xorg-3.tar contains xc/doc/specs, xc/util
xorg-4.tar contains xc/doc/hardcopy
If you define BuildFonts to NO in your site.def file, then you only need
to unpack tog-1.tar to build. If you build fonts, then you will also
need tog-2.tar to build. If you already have the fonts from prior
to unpack xorg-1.tar to build. If you build fonts, then you will also
need xorg-2.tar to build. If you already have the fonts from prior
releases you can use those instead of downloading them again. We presume
that you know how to copy or move them from your old source tree to the
R6.4 source tree.
R6.5.1 source tree.
3.3. Unpacking the Distribution
......@@ -196,26 +203,27 @@ Create a directory to hold the sources and cd into it:
% mkdir sourcedir
% cd sourcedir
Then for each tar file tog-*.tar.gz, execute this:
Then for each tar file xorg-*.tar.gz, execute this:
% gunzip -c ftp-dir/tog-N.tar.gz | tar xf -
% gunzip -c ftp-dir/xorg-N.tar.gz | tar xf -
or if you have GNU's tar (FreeBSD, NetBSD, OpenBSD, or Linux too)
% tar xzf ftp-dir/tog-N.tar.gz
% tar xzf ftp-dir/xorg-N.tar.gz
3.4. Applying Patches
If some time has elapsed since the initial release of R6.4, check to see
if any public patches have been released. The source tar files may have
been updated -- check the patch-level line in the bug-report template.
If the source in the tar files has not been updated then get all the
patches and apply them, following the instructions at the top of each
patch. Ignore the rebuild steps in the patch application instructions.
If some time has elapsed since the initial release of R6.5.1, check to
see if any public patches have been released. The source tar files may
have been updated -- check the patch-level line in the bug-report tem-
plate. If the source in the tar files has not been updated then get all
the patches and apply them, following the instructions at the top of
each patch. Ignore the rebuild steps in the patch application instruc-
tions.
See the section "Public Patches" later in this document.
......@@ -344,7 +352,8 @@ bsd.cf, convex.cf, DGUX.cf, luna.cf, macII.cf, Mips.cf, moto.cf, Oki.cf,
pegasus.cf, x386.cf. Amoeba.cf is known to require additional patches.
The file xc/lib/Xdmcp/Wraphelp.c, for XDM-AUTHORIZATION-1, is not
included in this release. See ftp://ftp.x.org/pub/R6.4/xdm-auth/README.
included in this release. See ftp://ftp.x.org/pub/R6.5.1/xdm-
auth/README.
3.6. System Build Notes
......@@ -384,19 +393,19 @@ to edit xc/config/imake/Makefile.ini to specify gcc instead of cc.
Use of the GNU BinUtils assembler, as, and linker, ld, is not supported
-- period! If you have them installed on your system you must rename or
remove them for the duration of the R6.4 build. (You can restore them
remove them for the duration of the R6.5.1 build. (You can restore them
afterwards.)
The system-supplied make works just fine for building R6.4 and that's
The system-supplied make works just fine for building R6.5.1 and that's
what we suggest you use. If you've replaced your system's make with GNU
make then we recommend that you restore the system make for the duration
of your R6.4 build. After R6.4 is done building you can revert to GNU
make. GNU make on most systems (except Linux, where it is the default
make) is not a supported build configuration. GNU make may work for you,
and if it does, great; but if it doesn't we do not consider it a bug in
R6.4. If, after this admonition, you still use GNU make and your build
fails, reread the above, and retry the build with the system's make
before you file a bug-report.
of your R6.5.1 build. After R6.5.1 is done building you can revert to
GNU make. GNU make on most systems (except Linux, where it is the
default make) is not a supported build configuration. GNU make may work
for you, and if it does, great; but if it doesn't we do not consider it
a bug in R6.5.1. If, after this admonition, you still use GNU make and
your build fails, reread the above, and retry the build with the sys-
tem's make before you file a bug-report.
3.6.3. IBM AIX 4.x
......@@ -545,8 +554,8 @@ You can install the manual pages by typing the following as root:
The version number of some of the the shared libraries has been changed.
On SunOS 4, which supports minor version numbers for shared libraries,
programs linked with the R6.4 libraries will use the new libraries with
no special action required.
programs linked with the R6.5.1 libraries will use the new libraries
with no special action required.
On most other modern operating systems the version portion of the
library name, i.e. "6.1" portion of "libX11.so.6.1" is a string. Even if
......@@ -783,8 +792,8 @@ The Open Group X Project Team may from time to time issue public patches
for this release to fix any serious problems that are discovered. Such
fixes are a subset of fixes available to X Project Team members. Public
patches are available via anonymous FTP from
ftp://ftp.x.org/pub/R6.4/fixes, or from your local X mirror site. Check
the site closest to you first.
ftp://ftp.x.org/pub/R6.5.1/fixes, or from your local X mirror site.
Check the site closest to you first.
You can determine which public patches have already been applied to your
source tree by examining the "VERSION" line of xc/bug-report. The source
......
XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $
XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $
XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
XCOMM $XFree86: xc/Imakefile,v 3.24 2001/02/07 18:53:11 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
RELEASE = "Release 6.4"
RELEASE = XOrgReleaseString
#ifndef OSName
#define OSName Unknown Operating System!
#endif
......@@ -45,16 +50,26 @@ VerifyOS::
@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")."
@echo ""
#ifdef LinuxArchitecture
VerifyOS::
@echo Linux Distribution: LinuxDistName
@echo libc version: LinuxCLibMajorVersion"."LinuxCLibMinorVersion"."LinuxCLibTeenyVersion
@echo binutils version: `expr LinuxBinUtilsMajorVersion / 10`.`expr LinuxBinUtilsMajorVersion % 10`
@echo ""
#endif
#if defined(GccMajorVersion) && defined(GccMinorVersion)
VerifyOS::
@echo GCC version: GccMajorVersion"."GccMinorVersion
@echo ""
#endif
#ifdef XFree86Version
version.def::
$(RM) $(IRULESRC)/version.def
$(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
#else
version.def::
#endif
includes::
MakeDir($(BUILDINCDIR))
MakeDir($(BUILDBINDIR))
......@@ -97,9 +112,9 @@ Everything::
XCOMM clean out link tree looking for stuff that should get checked in
dangerous_strip_clean::
$(MAKE) -k clean
$(MAKE) -k distclean
find . -type l -exec rm {} \;
find . \( \! \( -type d -o -name Makefile \) \) -print
find . \( \! -type d \) -print
#else /* OS2Architecture */
VerifyOS::
......@@ -124,7 +139,7 @@ Everything::
@echo :
\indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe
if exist Makefile.bak del Makefile.bak
if exist MAkefile ren Makefile Makefile.bak
if exist Makefile ren Makefile Makefile.bak
$(MAKE) $(MFLAGS) -f Makefile.bak Makefile
$(MAKE) $(MFLAGS) SHELL= VerifyOS
$(MAKE) $(MFLAGS) SHELL= Makefiles
......
# $TOG: Makefile /main/37 1998/02/17 14:30:04 kaleb $
# $XFree86: xc/Makefile,v 3.16 2000/03/22 21:23:30 dawes Exp $
# $Xorg: Makefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
# $XFree86: xc/Makefile,v 3.20 2001/01/24 17:28:53 tsi Exp $
# Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file.
RELEASE = "Release 6.4"
RELEASE = "Release 6.5"
SHELL = /bin/sh
RM = rm -f
MV = mv
......@@ -46,6 +49,11 @@ World:
;; esac;
@date
@echo ""
@if [ -f xmakefile ]; then \
$(MAKE_CMD) -k distclean || \
$(MAKE_CMD) -k clean || \
$(RM) xmakefile; \
fi
@if [ ! -f $(IRULESRC)/host.def ]; then \
if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \
echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \
......@@ -57,11 +65,15 @@ World:
fi; \
fi; \
fi
@if [ ! -f $(IRULESRC)/version.def ]; then \
echo "" > $(IRULESRC)/version.def; \
fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) version.def
$(MAKE_CMD) $(MFLAGS) Makefiles
$(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS=
$(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
$(MAKE_CMD) $(MFLAGS) includes
$(MAKE_CMD) $(MFLAGS) depend
$(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
......@@ -78,6 +90,7 @@ World:
# the Makefile.proto files.
Makefile.boot: imake.bootstrap
$(RM) $(IMAKESRC)/Makefile.proto
imake.proto:
cd $(IMAKESRC) && $(MAKE) $(FLAGS)
......@@ -106,6 +119,7 @@ Makefile::
$(MAKE) $(MFLAGS) xmakefile
xmakefile: Imakefile
$(RM) xmakefile
$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
World.Win32:
......@@ -168,6 +182,9 @@ clean:
$(MAKE_CMD) $@
dangerous_strip_clean:
$(MAKE_CMD) $@
distclean:
$(MAKE_CMD) $@
$(RM) xmakefile
depend:
$(MAKE_CMD) $@
Everything:
......
This diff is collapsed.
[PLEASE make your Subject: line as descriptive as possible.
Subjects like "xterm bug" or "bug report" are not helpful!]
[Remove all the explanatory text in brackets before mailing.]
[Send to xbugs@opengroup.org, as shown in the sample message
[Send to xbugs@x.org, as shown in the sample message
header below]
To: xbugs@opengroup.org
To: xbugs@x.org
Subject: [area]: [synopsis] [replace with actual area and short description]
VERSION:
R6.4, public-patch-3
[X Project Team public patches edit this line to indicate the patch level]
R6.5.1, public-patch-1
CLIENT MACHINE and OPERATING SYSTEM:
......
XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $
XCOMM $XFree86: xc/config/Imakefile,v 1.2 2000/02/13 00:12:18 dawes Exp $
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......
XCOMM platform: $XConsortium: Amoeba.cf /main/12 1996/09/28 16:04:48 rws $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.9 1996/12/23 05:50:00 dawes Exp $
XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10 2001/01/17 16:22:29 dawes Exp $
/* The presence of this configuration file in the X distribution
* does not imply full support for the system it describes.
......
XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Exp $
XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.6 2001/01/12 19:28:20 dawes Exp $
/* Copyright Takis Psarogiannakopoulos <takis@pmms.cam.ac.uk>
* This is the DG/ux configuration file of X11R6.3
*/
......@@ -101,7 +101,9 @@ XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Ex
#define ToolkitStringsABIOptions -intelabi -earlyR6bc
#endif
#ifndef DefaultCCOptions
#define DefaultCCOptions /* -ansi -pedantic */
#endif
#define OptimizedCDebugFlags -O2 /* Add -g -mstandard for full debuging info */
#define OptimizedCplusplusDebugFlags
#define DebuggableCDebugFlags -g -mstandard
......
XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM
XCOMM
XCOMM
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101 2000/12/04 18:49:09 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.104 2001/01/17 16:22:29 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -36,7 +36,7 @@ XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101 2000/12/04 18:49:09 d
#define OSRelVersion __FreeBSD_version
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OsRelVersion)
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion)
#define HasCplusplus YES
......@@ -60,6 +60,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasVarRun YES
#define HasVarDb YES
#if (OSMajorVersion > 1)
#define InstallXloadSetGID NO
#else
#define InstallXloadSetGID YES
#endif
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
......@@ -87,11 +93,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
#ifndef DefaultCCOptions
#if defined(UseInstalled)
#define DefaultCCOptions /**/
#else
#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions
#endif
#endif
#ifndef ExtraLibraries
/* support for multi-byte locales is in libxpg4 rather than libc */
#if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
......@@ -408,85 +416,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define CompressManPages YES
#endif
#if CompressManPages
#ifndef CompressManCmd
# define CompressManCmd gzip -n
#endif
COMPRESSMANCMD = CompressManCmd
#ifndef InstallManPageLong
#define InstallManPageLong(file,destdir,dest) @@\
BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
@@\
install.man:: file.man @@\
MakeDir($(DESTDIR)destdir) @@\
$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\
$(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\
$(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
#endif
#ifndef InstallGenManPageLong
#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
BuildInstallHtmlManPage(file,dest,suffix) @@\
@@\
install.man:: file.man @@\
MakeDir($(DESTDIR)destdir) @@\
$(RM) $(DESTDIR)destdir/dest.suffix* @@\
$(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\
$(DESTDIR)destdir/dest.suffix @@\
-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
#endif
#ifndef InstallMultipleMan
#define InstallMultipleMan(list,dest) @@\
install.man:: list @@\
MakeDir($(DESTDIR)dest) @@\
@case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
for i in list; do \ @@\
(MNAME=`echo $$i | cut -f1 -d.`; \ @@\
set -x; \ @@\
$(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\
$(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\
$(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
$(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\
done
#endif
/*
* InstallManPageAliases - install soft links for aliases.
*/
#ifndef InstallManPageAliasesBase
#define InstallManPageAliasesBase(file,destdir,aliases) @@\
install.man:: @@\
@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\
for i in aliases; do (set -x; \ @@\
$(RM) $(DESTDIR)destdir/$$i.*; \ @@\
(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\
$$i.$${SUFFIX})); \ @@\
done)
#endif
#ifndef InstallManPageAliases
#define InstallManPageAliases(file,destdir,aliases) @@\
InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
@@\
InstallManPageAliasesBase(file,destdir,aliases)
#endif
/*
* InstallGenManPageAliases - install soft links for aliases.
*/
#ifndef InstallGenManPageAliases
#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
InstallHtmlManPageAliases(file,aliases,suffix) @@\
@@\
InstallManPageAliasesBase(file,destdir,aliases)
#endif
#endif
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
#define HasBsdMake YES
#endif
......
XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
/*
* To add support for another platform:
*
......@@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.63 2000/11/06 19:24:00 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.64 2001/01/17 16:22:29 dawes Exp $
#if defined(__APPLE__)
# undef __APPLE__
......@@ -799,17 +799,14 @@ XCOMM for compatibility with 3.3.x
# define mc68000Architecture
#endif /* __sxg__ */
#if defined(sequent) || defined(_SEQUENT_)
#ifdef _SEQUENT_
/* undefine assignments resulting from -DSVR4 */
# undef MacroIncludeFile
# define MacroIncludeFile <sequent.cf>
# undef MacroFile
# define MacroFile sequent.cf
# ifdef sequent
# undef sequent
# define Dynix3Architecture
# endif
# ifdef _SEQUENT_
# undef _SEQUENT_
# define DynixPtxArchitecture
# endif
# undef _SEQUENT_
# define DynixPtxArchitecture
# define SequentArchitecture
#endif
......
XCOMM ---------------------------------------------------------------------
XCOMM Imake rules for building libraries, programs, scripts, and data files
XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
XCOMM rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.92 2001/02/07 23:28:44 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -466,7 +466,7 @@ ProgramTargetName(program.tc): deplist @@\
RemoveTargetProgram($@) @@\
$(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
@@\
clean clean.tc:: @@\
clean cleantc:: @@\
RemoveFiles(program.tc program.tc.*.*)
#else
#define ProofProgramTarget(program,deplist,linklist) /**/
......@@ -483,7 +483,7 @@ ProgramTargetName(program.tc): deplist @@\
RemoveTargetProgram($@) @@\
$(CXXENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
@@\
clean clean.tc:: @@\
clean cleantc:: @@\
RemoveFiles(program.tc program.tc.*.*)
#else
#define ProofCplusplusProgramTarget(program,deplist,linklist) /**/
......@@ -493,7 +493,7 @@ clean clean.tc:: @@\
#ifndef ProofCleanTarget
#if HasTestCenter
#define ProofCleanTarget() @@\
clean clean.tc:: @@\
clean cleantc:: @@\
$(RM) -r TC.Cache
#else
#define ProofCleanTarget() /**/
......@@ -1185,6 +1185,7 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest)
#endif /* InstallLintLibrary */
#if !CompressManPages
/*
* InstallManPageLong - generate rules to install the indicated manual page,
* giving it an alternate name. This is used for installing man pages whose
......@@ -1196,19 +1197,12 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest)
#define InstallManPageLong(file,destdir,dest) @@\
BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\