Path: utzoo!censor!comspec!humvax!becker!ncrcan!attcan!uunet!wuarchive!udel!princeton!njin!paul.rutgers.edu!chain From: chain@paul.rutgers.edu (Chain Lee) Newsgroups: alt.sources Subject: X11R4 patch for SCO XENIX (part09) Message-ID: Date: 7 Jan 91 02:27:45 GMT Organization: Rutgers Univ., New Brunswick, N.J. Lines: 996 *** X11R4.ORIG/mit/fonts/mkfontdir/mkfontdir.c Sun Dec 10 11:03:37 1989 --- X11R4/mit/fonts/mkfontdir/mkfontdir.c Sat Oct 6 17:08:46 1990 *************** *** 28,34 **** --- 28,39 ---- #include /* #include don't include this */ void XmuCopyISOLatin1Lowered(); + #ifdef xenix + #include + #define direct dirent + #else #include + #endif #include #include "fontdir.h" *** X11R4.ORIG/mit/fonts/bdftosnf/bdftosnf.h Mon Oct 9 14:54:56 1989 --- X11R4/mit/fonts/bdftosnf/bdftosnf.h Sun Dec 16 11:11:10 1990 *************** *** 56,63 **** # endif # else ! # ifdef apollo # define DEFAULTGLPAD 2 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ --- 56,71 ---- # endif # else ! # ifdef xenix + # define DEFAULTGLPAD 1 /* default padding for glyphs */ + # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ + # define DEFAULTBYTEORDER LSBFirst /* default bitmap byte order */ + # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ + + # else + # ifdef apollo + # define DEFAULTGLPAD 2 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ *************** *** 71,122 **** # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef hpux # define DEFAULTGLPAD 2 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef pegasus # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef macII # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef mips ! # ifdef MIPSEL # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER LSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER LSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # endif ! # else # define DEFAULTGLPAD 1 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ # endif # endif # endif --- 79,131 ---- # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef hpux # define DEFAULTGLPAD 2 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef pegasus # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef macII # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else ! # ifdef mips ! # ifdef MIPSEL # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER LSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER LSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # else # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ ! # endif ! # else # define DEFAULTGLPAD 1 /* default padding for glyphs */ # define DEFAULTBITORDER MSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ + # endif # endif # endif # endif *** X11R4.ORIG/mit/clients/xterm/main.c Sat Jan 5 22:00:04 1991 --- X11R4/mit/clients/xterm/main.c Sat Nov 3 17:39:33 1990 *************** *** 2377,2387 **** --- 2377,2393 ---- ioctl (fd, FIONREAD, (char *) &arg); return (int) arg; #else + #ifdef xenix + static long arg; + fionread (fd, (char *) &arg); + return (int) arg; + #else struct pollfd pollfds[1]; pollfds[0].fd = fd; pollfds[0].events = POLLIN; return poll (pollfds, 1, 0); + #endif #endif } *** X11R4.ORIG/mit/clients/xterm/Imakefile Sat Jan 5 22:03:59 1991 --- X11R4/mit/clients/xterm/Imakefile Sat Nov 3 17:50:53 1990 *************** *** 10,16 **** /**/########################################################################### #ifdef BandAidCompiler ! #include BandAidCompiler #endif /* --- 10,16 ---- /**/########################################################################### #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif /* *** X11R4.ORIG/mit/clients/xmh/command.c Sat Dec 16 21:54:10 1989 --- X11R4/mit/clients/xmh/command.c Sun Oct 7 15:46:11 1990 *************** *** 376,382 **** --- 376,386 ---- int *lenP; { long nread; + #ifdef xenix + if (fionread( fd, &nread ) < 0 /*failed*/) { + #else if (ioctl( fd, FIONREAD, &nread ) /*failed*/) { + #endif SystemError( "couldn't inquire bytes in pipe" ); } else if (nread) { *** X11R4.ORIG/mit/clients/xmh/msg.c Sat Dec 16 03:35:47 1989 --- X11R4/mit/clients/xmh/msg.c Sun Nov 4 20:16:12 1990 *************** *** 751,756 **** --- 751,757 ---- static int compsize = 0; static XawTextPosition startPos; char *file, **argv; + char *index(); int fid; if (blankcomp == NULL) { file = MakeNewTempFileName(); *** X11R4.ORIG/mit/clients/xmh/Imakefile Fri Oct 6 15:11:21 1989 --- X11R4/mit/clients/xmh/Imakefile Fri Oct 5 21:59:20 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif INCLUDES = -I$(TOP) -I$(AWIDGETSRC) -I$(TOOLKITSRC) --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif INCLUDES = -I$(TOP) -I$(AWIDGETSRC) -I$(TOOLKITSRC) *** X11R4.ORIG/mit/clients/xfd/Imakefile Fri Nov 24 17:46:52 1989 --- X11R4/mit/clients/xfd/Imakefile Fri Oct 5 21:57:27 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif DEPLIBS = XawClientDepLibs --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif DEPLIBS = XawClientDepLibs *** X11R4.ORIG/mit/clients/xedit/Imakefile Fri Nov 24 18:03:32 1989 --- X11R4/mit/clients/xedit/Imakefile Fri Oct 5 21:57:02 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif DEPLIBS = XawClientDepLibs --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif DEPLIBS = XawClientDepLibs *** X11R4.ORIG/mit/clients/xinit/xinit.c Fri May 18 11:25:27 1990 --- X11R4/mit/clients/xinit/xinit.c Wed Nov 7 00:02:20 1990 *************** *** 381,389 **** serverpid = vfork(); switch(serverpid) { case 0: close(0); close(1); ! /* * don't hang on read/write to control tty */ --- 381,390 ---- serverpid = vfork(); switch(serverpid) { case 0: + #ifndef xenix close(0); close(1); ! #endif /* * don't hang on read/write to control tty */ *************** *** 403,410 **** * prevent server from getting sighup from vhangup() * if client is xterm -L */ setpgrp(0,getpid()); ! Execute (server); Error ("no server \"%s\" in PATH\n", server[0]); { --- 404,412 ---- * prevent server from getting sighup from vhangup() * if client is xterm -L */ + #ifndef xenix setpgrp(0,getpid()); ! #endif Execute (server); Error ("no server \"%s\" in PATH\n", server[0]); { *************** *** 486,492 **** --- 488,498 ---- } #ifdef SYSV + #ifdef xenix + #define killpg(pgrp, sig) kill(pgrp, sig) + #else #define killpg(pgrp, sig) kill(-(pgrp), sig) + #endif #endif /* SYSV */ static jmp_buf close_env; *** X11R4.ORIG/mit/clients/xcalc/Imakefile Fri Dec 15 17:52:09 1989 --- X11R4/mit/clients/xcalc/Imakefile Fri Oct 5 21:55:38 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif #ifdef MacIIArchitecture --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif #ifdef MacIIArchitecture *** X11R4.ORIG/mit/clients/xclipboard/Imakefile Tue Dec 12 17:21:22 1989 --- X11R4/mit/clients/xclipboard/Imakefile Fri Oct 5 21:56:20 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif SRCS1 = xclipboard.c --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif SRCS1 = xclipboard.c *** X11R4.ORIG/mit/clients/xman/man.c Wed Dec 13 17:07:56 1989 --- X11R4/mit/clients/xman/man.c Wed Oct 31 22:46:33 1990 *************** *** 128,134 **** /* * realloc manual to be minimum space necessary. */ - manual = (Manual *) realloc( (char *) manual, (sizeof(Manual) * sect)); if (manual == NULL) PrintError("Could not allocate memory for manual sections."); --- 128,133 ---- *** X11R4.ORIG/mit/clients/xdm/Imakefile Sat Jan 5 22:02:34 1991 --- X11R4/mit/clients/xdm/Imakefile Sat Nov 3 17:48:22 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif #if InstallXdmConfig --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif #if InstallXdmConfig *** X11R4.ORIG/mit/clients/oclock/Imakefile Thu Dec 14 14:08:59 1989 --- X11R4/mit/clients/oclock/Imakefile Fri Oct 5 21:54:50 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif DEFINES = ExtensionDefines --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif DEFINES = ExtensionDefines *** X11R4.ORIG/mit/clients/Imakefile Fri Dec 15 10:53:04 1989 --- X11R4/mit/clients/Imakefile Sun Oct 7 18:41:37 1990 *************** *** 5,20 **** #ifdef ATTArchitecture OTHERSUBDIRS = xhost #else ! OTHERSUBDIRS = xdm xhost #endif #endif SUBDIRS = \ ! appres bitmap listres oclock twm xauth xbiff xcalc xclipboard xclock \ ! xditview xdpyinfo xedit xfd xinit xkill xload xlogo \ xlsatoms xlsclients xlsfonts xlswins xmag xman xmh \ xmodmap xpr xprop xrdb xrefresh xfontsel $(OTHERSUBDIRS) \ xset xsetroot xstdcmap xterm xwd xwininfo xwud MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) --- 5,25 ---- #ifdef ATTArchitecture OTHERSUBDIRS = xhost #else ! OTHERSUBDIRS = ! OTHERSUBDIRS_UNBUILDABLE = \ ! xdm xhost #endif #endif SUBDIRS = \ ! appres bitmap listres oclock twm xbiff xcalc xclipboard xclock \ ! xdpyinfo xedit xfd xinit xkill xlogo \ xlsatoms xlsclients xlsfonts xlswins xmag xman xmh \ xmodmap xpr xprop xrdb xrefresh xfontsel $(OTHERSUBDIRS) \ xset xsetroot xstdcmap xterm xwd xwininfo xwud + + UNBUILDABLE = \ + xauth xditview xload MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) *** X11R4.ORIG/mit/util/scripts/bsdinst.sh Thu Oct 20 17:37:12 1988 --- X11R4/mit/util/scripts/bsdinst.sh Sat Oct 6 22:11:56 1990 *************** *** 85,91 **** # do the actual install (remove destination since SysV install doesn't) rm -f $dst/$srcbase ! (cd $srcdir ; install -f $dst $flags $src) # and clean up --- 85,92 ---- # do the actual install (remove destination since SysV install doesn't) rm -f $dst/$srcbase ! #(cd $srcdir ; install -f $dst $flags $src) ! (cd $srcdir ; cp $src $dst) # and clean up *** X11R4.ORIG/mit/rgb/showrgb.c Wed Dec 13 09:01:50 1989 --- X11R4/mit/rgb/showrgb.c Sat Oct 6 21:41:00 1990 *************** *** 99,104 **** fprintf (stderr, "\"\n"); } } ! dbm_close (rgb_dbm); } --- 99,123 ---- fprintf (stderr, "\"\n"); } } ! #ifndef xenix dbm_close (rgb_dbm); + #endif + } + + bcopy (b1, b2, length) + register unsigned char *b1, *b2; + register length; + { + if (b1 < b2) { + b2 += length; + b1 += length; + while (length--) { + *--b2 = *--b1; + } + } + else { + while (length--) { + *b2++ = *b1++; + } + } } *** X11R4.ORIG/mit/rgb/rgb.c Wed Dec 13 09:01:47 1989 --- X11R4/mit/rgb/rgb.c Sat Oct 6 21:37:44 1990 *************** *** 127,134 **** fflush (stderr); } } ! dbm_close(rgb_dbm); ! exit(0); } --- 127,134 ---- fflush (stderr); } } ! #ifndef xenix dbm_close(rgb_dbm); ! #endif exit(0); } *** X11R4.ORIG/mit/examples/Xaw/Imakefile Wed Dec 13 18:12:23 1989 --- X11R4/mit/examples/Xaw/Imakefile Fri Oct 12 21:04:59 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif SRCS = popup.c \ --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif SRCS = popup.c \ *** X11R4.ORIG/mit/demos/ico/ico.c Tue Dec 19 13:45:36 1989 --- X11R4/mit/demos/ico/ico.c Wed Oct 17 23:17:59 1990 *************** *** 147,153 **** --- 147,157 ---- " -copy copy multibuffer frames instead of clearing", " -lw number line width to use", " -i invert", + #ifdef xenix + " -sleep number miliseconds to sleep in between draws", + #else " -sleep number seconds to sleep in between draws", + #endif " -obj objname type of polyhedral object to draw", " -objhelp list polyhedral objects available", NULL}; *************** *** 732,738 **** --- 736,746 ---- } if (dblbuf) dbpair.dbufnum = 1 - dbpair.dbufnum; + #ifdef xenix + if (!multibuf && sleepcount) nap(sleepcount); + #else if (!multibuf && sleepcount) sleep(sleepcount); + #endif } char *xalloc(nbytes) *** X11R4.ORIG/mit/demos/xeyes/Imakefile Fri Jul 21 12:57:51 1989 --- X11R4/mit/demos/xeyes/Imakefile Fri Oct 5 22:02:21 1990 *************** *** 1,5 **** #ifdef BandAidCompiler ! #include BandAidCompiler #endif DEFINES = -DSHAPE --- 1,5 ---- #ifdef BandAidCompiler ! #include "BandAidCompiler" #endif DEFINES = -DSHAPE *** X11R4.ORIG/mit/demos/puzzle/puzzle.c Tue Dec 12 14:43:09 1989 --- X11R4/mit/demos/puzzle/puzzle.c Sun Oct 7 19:38:08 1990 *************** *** 419,436 **** LogMoveSpace(first_x,first_y,last_x,last_y,shift_dir); } - #ifdef USG - int gettimeofday (tvp, tzp) - struct timeval *tvp; - struct timezone *tzp; - { - time (&tvp->tv_sec); - tvp->tv_usec = 0L; - - /* ignore tzp for now since this file doesn't use it */ - } - #endif - initialize() { /** Initialize the position and --- 419,424 ---- *** X11R4.ORIG/mit/extensions/lib/extutil.c Sun Dec 10 22:54:49 1989 --- X11R4/mit/extensions/lib/extutil.c Sat Oct 6 16:57:22 1990 *************** *** 257,259 **** --- 257,268 ---- if (!ext_name) ext_name = X_EXTENSION_UNKNOWN; return (*func) (dpy, ext_name, X_EXTENSION_MISSING); } + + #ifdef xenix + static void + dummy() + { + extern void ___extensions_lib_globals(); + ___extensions_lib_globals(); + } + #endif *** X11R4.ORIG/mit/extensions/lib/globals.c Tue Oct 3 17:25:12 1989 --- X11R4/mit/extensions/lib/globals.c Sat Oct 6 16:35:18 1990 *************** *** 58,63 **** --- 58,67 ---- * to be inserted BELOW this point!!! */ + #ifdef xenix + void ___extensions_lib_globals(){} + #endif + /* * NOTE: any additional external definition NEED * to be inserted ABOVE this point!!! *** X11R4.ORIG/mit/extensions/server/multibuf.c Sun Dec 10 11:03:58 1989 --- X11R4/mit/extensions/server/multibuf.c Sat Oct 6 15:44:52 1990 *************** *** 44,50 **** #include "regionstr.h" #include "gcstruct.h" #include "inputstr.h" ! #include /* * per-Multibuffer data --- 44,51 ---- #include "regionstr.h" #include "gcstruct.h" #include "inputstr.h" ! ! #include "Xos.h" /* * per-Multibuffer data *** X11R4.ORIG/mit/config/Imake.tmpl Thu Aug 30 13:44:24 1990 --- X11R4/mit/config/Imake.tmpl Fri Oct 5 21:03:08 1990 *************** *** 43,53 **** * 4. Create a .cf file with the name given by MacroFile. */ - #ifdef OSK - #define MacroIncludeFile - #define MacroFile osk.cf - #endif - #ifdef ultrix #define MacroIncludeFile #define MacroFile ultrix.cf --- 43,48 ---- *************** *** 77,82 **** --- 72,84 ---- #define SunArchitecture #endif /* sun */ + #ifdef xenix + #define MacroIncludeFile + #define MacroFile xenix.cf + #undef xenix + #define SunArchitecture + #endif /* xenix */ + #ifdef hpux #define MacroIncludeFile #define MacroFile hp.cf *************** *** 187,193 **** #ifndef MacroIncludeFile /**/# WARNING: Imake.tmpl not configured; guessing at definitions!!! ! /**/# This might mean that BOOTSTRAPCFLAGS wasnt set when building imake. #define MacroIncludeFile #define MacroFile generic.cf #endif --- 189,195 ---- #ifndef MacroIncludeFile /**/# WARNING: Imake.tmpl not configured; guessing at definitions!!! ! /**/# This might mean that BOOTSTRAPCFLAGS wasn't set when building imake. #define MacroIncludeFile #define MacroFile generic.cf #endif *************** *** 333,348 **** #endif #ifndef DestDir ! #define DestDir /* as nothing */ #endif #ifndef UsrLibDir /* if changed under SunOS with shared */ ! #define UsrLibDir $(DESTDIR)/usr/lib /* libs, then need to run ldconfig */ #endif /* as root */ #ifndef IncRoot ! #define IncRoot $(DESTDIR)/usr/include #endif #ifndef UNCOMPRESSPATH ! #define UNCOMPRESSPATH /usr/ucb/uncompress #endif #ifndef OptimizedCDebugFlags #define OptimizedCDebugFlags -O --- 335,350 ---- #endif #ifndef DestDir ! #define DestDir /usr/local/X11 #endif #ifndef UsrLibDir /* if changed under SunOS with shared */ ! #define UsrLibDir $(DESTDIR)/lib /* libs, then need to run ldconfig */ #endif /* as root */ #ifndef IncRoot ! #define IncRoot $(DESTDIR)/include #endif #ifndef UNCOMPRESSPATH ! #define UNCOMPRESSPATH /usr/local/bin/uncompress #endif #ifndef OptimizedCDebugFlags #define OptimizedCDebugFlags -O *** X11R4.ORIG/mit/config/Imake.rules Fri Feb 16 15:40:03 1990 --- X11R4/mit/config/Imake.rules Mon Dec 18 17:14:19 1989 *************** *** 328,334 **** #ifndef InstallSharedLibrary #define InstallSharedLibrary(libname,rev,dest) @@\ install:: lib/**/libname.so.rev @@\ ! $(INSTALL) -c lib/**/libname.so.rev dest @@\ #endif /* InstallSharedLibrary */ --- 328,334 ---- #ifndef InstallSharedLibrary #define InstallSharedLibrary(libname,rev,dest) @@\ install:: lib/**/libname.so.rev @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.so.rev dest @@\ #endif /* InstallSharedLibrary */ *************** *** 338,345 **** #ifndef InstallSharedLibraryData #define InstallSharedLibraryData(libname,rev,dest) @@\ install:: lib/**/libname.sa.rev @@\ ! $(INSTALL) -c lib/**/libname.sa.rev dest @@\ ! $(RANLIB) $(RANLIBINSTFLAGS) dest/lib/**/libname.sa.rev #endif /* InstallSharedLibraryData */ --- 338,344 ---- #ifndef InstallSharedLibraryData #define InstallSharedLibraryData(libname,rev,dest) @@\ install:: lib/**/libname.sa.rev @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.sa.rev dest #endif /* InstallSharedLibraryData */ *** X11R4.ORIG/mit/config/Project.tmpl Fri Feb 16 18:09:05 1990 --- X11R4/mit/config/Project.tmpl Thu Sep 13 04:55:47 1990 *************** *** 20,26 **** #define BuildServer YES /* go ahead and build server */ #endif #ifndef BuildExamples ! #define BuildExamples YES /* but they do take a lot of space */ #endif #ifndef BuildXawBC #define BuildXawBC NO /* be pure */ --- 20,26 ---- #define BuildServer YES /* go ahead and build server */ #endif #ifndef BuildExamples ! #define BuildExamples NO /* but they do take a lot of space */ #endif #ifndef BuildXawBC #define BuildXawBC NO /* be pure */ *************** *** 83,89 **** #define NeedBerklibInXlib NO #endif #ifndef ManDirectoryRoot ! #define ManDirectoryRoot /usr/man/X11 /* if not set in .macros */ #endif #ifndef ManSuffix #define ManSuffix n /* use just one tab or cpp will die */ --- 83,89 ---- #define NeedBerklibInXlib NO #endif #ifndef ManDirectoryRoot ! #define ManDirectoryRoot /usr/man /* if not set in .macros */ #endif #ifndef ManSuffix #define ManSuffix n /* use just one tab or cpp will die */ *************** *** 148,157 **** #endif #ifndef BinDir ! #define BinDir $(DESTDIR)/usr/bin/X11 #endif #ifndef IncRoot ! #define IncRoot $(DESTDIR)/usr/include #endif #ifndef BuildIncRoot #define BuildIncRoot $(TOP) --- 148,157 ---- #endif #ifndef BinDir ! #define BinDir $(DESTDIR)/bin #endif #ifndef IncRoot ! #define IncRoot $(DESTDIR)/include #endif #ifndef BuildIncRoot #define BuildIncRoot $(TOP) *************** *** 172,178 **** #define FontDir $(LIBDIR)/fonts #endif #ifndef AdmDir ! #define AdmDir $(DESTDIR)/usr/adm #endif #ifndef XinitDir #define XinitDir $(LIBDIR)/xinit --- 172,178 ---- #define FontDir $(LIBDIR)/fonts #endif #ifndef AdmDir ! #define AdmDir /usr/adm #endif #ifndef XinitDir #define XinitDir $(LIBDIR)/xinit *************** *** 193,199 **** #define GwmDir $(LIBDIR)/gwm #endif #ifndef ManPath ! #define ManPath $(DESTDIR)/**/ManDirectoryRoot #endif #ifndef ManSourcePath #define ManSourcePath $(MANPATH)/man --- 193,199 ---- #define GwmDir $(LIBDIR)/gwm #endif #ifndef ManPath ! #define ManPath $(DESTDIR)/man #endif #ifndef ManSourcePath #define ManSourcePath $(MANPATH)/man *************** *** 430,443 **** #define _Use(a,b) b #endif #if SharedLibXext ! DEPEXTENSIONLIB = _Use($(USRLIBDIR),$(EXTENSIONSRC)/lib)/libXext.so.$(SOXEXTREV) EXTENSIONLIB = _Use(-lXext,-L$(EXTENSIONSRC) -lXext) #else DEPEXTENSIONLIB = _Use($(USRLIBDIR),$(EXTENSIONSRC)/lib)/libXext.a EXTENSIONLIB = LoaderLibPrefix _Use(-lXext, $(DEPEXTENSIONLIB)) #endif #if SharedLibX ! DEPXLIB = $(DEPEXTENSIONLIB) _Use($(USRLIBDIR),$(XLIBSRC))/libX11.so.$(SOXLIBREV) XLIB = $(EXTENSIONLIB) _Use(-lX11,-L$(XLIBSRC) -lX11) #else DEPXLIB = $(DEPEXTENSIONLIB) _Use($(USRLIBDIR),$(XLIBSRC))/libX11.a --- 430,443 ---- #define _Use(a,b) b #endif #if SharedLibXext ! DEPEXTENSIONLIB = /* _Use($(USRLIBDIR),$(EXTENSIONSRC)/lib)/libXext.so.$(SOXEXTREV) */ EXTENSIONLIB = _Use(-lXext,-L$(EXTENSIONSRC) -lXext) #else DEPEXTENSIONLIB = _Use($(USRLIBDIR),$(EXTENSIONSRC)/lib)/libXext.a EXTENSIONLIB = LoaderLibPrefix _Use(-lXext, $(DEPEXTENSIONLIB)) #endif #if SharedLibX ! DEPXLIB = $(DEPEXTENSIONLIB) /* _Use($(USRLIBDIR),$(XLIBSRC))/libX11.so.$(SOXLIBREV) */ XLIB = $(EXTENSIONLIB) _Use(-lX11,-L$(XLIBSRC) -lX11) #else DEPXLIB = $(DEPEXTENSIONLIB) _Use($(USRLIBDIR),$(XLIBSRC))/libX11.a *************** *** 446,473 **** DEPXAUTHLIB = _Use($(USRLIBDIR),$(XAUTHSRC))/libXau.a XAUTHLIB = LoaderLibPrefix _Use(-lXau,$(DEPXAUTHLIB)) #if SharedLibXmu ! DEPXMULIB = _Use($(USRLIBDIR),$(XMUSRC))/libXmu.so.$(SOXMUREV) XMULIB = _Use(-lXmu,-L$(XMUSRC) -lXmu) #else DEPXMULIB = _Use($(USRLIBDIR),$(XMUSRC))/libXmu.a XMULIB = LoaderLibPrefix _Use(-lXmu,$(DEPXMULIB)) #endif #if SharedOldLibX ! DEPOLDXLIB = _Use($(USRLIBDIR),$(OLDXLIBSRC))/liboldX.so.$(SOOLDXREV) OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) #else DEPOLDXLIB = _Use($(USRLIBDIR),$(OLDXLIBSRC))/liboldX.a OLDXLIB = LoaderLibPrefix _Use(-loldX,$(DEPOLDXLIB)) #endif #if SharedLibXt ! DEPXTOOLLIB = _Use($(USRLIBDIR),$(TOOLKITSRC))/libXt.so.$(SOXTREV) XTOOLLIB = _Use(-lXt,-L$(TOOLKITSRC) -lXt) #else DEPXTOOLLIB = _Use($(USRLIBDIR),$(TOOLKITSRC))/libXt.a XTOOLLIB = LoaderLibPrefix _Use(-lXt,$(DEPXTOOLLIB)) #endif #if SharedLibXaw ! DEPXAWLIB = _Use($(USRLIBDIR),$(AWIDGETSRC))/libXaw.so.$(SOXAWREV) XAWLIB = _Use(-lXaw,-L$(AWIDGETSRC) -lXaw) #else DEPXAWLIB = _Use($(USRLIBDIR),$(AWIDGETSRC))/libXaw.a --- 446,473 ---- DEPXAUTHLIB = _Use($(USRLIBDIR),$(XAUTHSRC))/libXau.a XAUTHLIB = LoaderLibPrefix _Use(-lXau,$(DEPXAUTHLIB)) #if SharedLibXmu ! DEPXMULIB = /* _Use($(USRLIBDIR),$(XMUSRC))/libXmu.so.$(SOXMUREV) */ XMULIB = _Use(-lXmu,-L$(XMUSRC) -lXmu) #else DEPXMULIB = _Use($(USRLIBDIR),$(XMUSRC))/libXmu.a XMULIB = LoaderLibPrefix _Use(-lXmu,$(DEPXMULIB)) #endif #if SharedOldLibX ! DEPOLDXLIB = /* _Use($(USRLIBDIR),$(OLDXLIBSRC))/liboldX.so.$(SOOLDXREV) */ OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) #else DEPOLDXLIB = _Use($(USRLIBDIR),$(OLDXLIBSRC))/liboldX.a OLDXLIB = LoaderLibPrefix _Use(-loldX,$(DEPOLDXLIB)) #endif #if SharedLibXt ! DEPXTOOLLIB = /* _Use($(USRLIBDIR),$(TOOLKITSRC))/libXt.so.$(SOXTREV) */ XTOOLLIB = _Use(-lXt,-L$(TOOLKITSRC) -lXt) #else DEPXTOOLLIB = _Use($(USRLIBDIR),$(TOOLKITSRC))/libXt.a XTOOLLIB = LoaderLibPrefix _Use(-lXt,$(DEPXTOOLLIB)) #endif #if SharedLibXaw ! DEPXAWLIB = /* _Use($(USRLIBDIR),$(AWIDGETSRC))/libXaw.so.$(SOXAWREV) */ XAWLIB = _Use(-lXaw,-L$(AWIDGETSRC) -lXaw) #else DEPXAWLIB = _Use($(USRLIBDIR),$(AWIDGETSRC))/libXaw.a *** X11R4.ORIG/mit/config/imakemdep.h Mon Dec 18 16:56:39 1989 --- X11R4/mit/config/imakemdep.h Fri Oct 5 21:30:20 1990 *************** *** 13,18 **** --- 13,22 ---- * These will be passed to the compile along with the contents of the * make variable BOOTSTRAPCFLAGS. */ + #ifdef M_XENIX + #define imake_ccflags "-DSYSV -DUSG" + #endif + #ifdef hpux #define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV" #endif *************** *** 111,116 **** --- 115,123 ---- #ifdef M4310 "-DM4310", /* Tektronix */ #endif + #ifdef M_XENIX + "-Dxenix", + #endif #ifdef macII "-DmacII", /* Apple A/UX */ #endif *************** *** 135,140 **** --- 142,150 ---- * in util/makedepend/main.c. */ struct symtab predefs[] = { + #ifdef M_XENIX + {"M_XENIX", "1"}, + #endif #ifdef apollo {"apollo", "1"}, #endif