From 0e09f6fe754d0f278c171e0526029d41e823334f Mon Sep 17 00:00:00 2001
From: duane <duane>
Date: Sun, 24 Mar 1996 01:52:55 +0000
Subject: [PATCH] see 4.3.devel.17 changelog entry for Sat Mar 23 17:46:14 1996
  Duane Rettig

---
 ChangeLog.n         | 12 ++++++++++++
 Makefile.linux86    | 42 ++++++++++++++++++++++++++++++++++++++++++
 Makefile.sunx86     |  2 +-
 misc/compile-1.lisp |  3 ++-
 tk/font.lisp        |  3 ++-
 5 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 Makefile.linux86

diff --git a/ChangeLog.n b/ChangeLog.n
index 647eabc7..42bd2bac 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,15 @@
+*******************************************************************************
+4.3.devel.17
+
+Sat Mar 23 17:46:14 1996  Duane Rettig  (duane at clay)
+
+	* Makefile.linux86: New file
+
+	* Makefile.sunx86: Change name
+
+	* misc/compile-1.lisp: misc/compile-1.lisp: Conditionalize on ics
+ 
+
 *************************************************************
 
 Thu Mar 14 21:11:06 PST 1996 Colin Meldrum (colin@vapor)
diff --git a/Makefile.linux86 b/Makefile.linux86
new file mode 100644
index 00000000..b5085ab0
--- /dev/null
+++ b/Makefile.linux86
@@ -0,0 +1,42 @@
+# $fiHeader: Makefile.sun4-svr4,v 1.8 1995/10/17 05:00:59 colin Exp $
+#
+#  Makefile.sun4-svr4 for CLIM 2.0
+#
+
+include Makefile.defs
+
+Makefile=Makefile.linux86
+
+# for other Motif versions use
+# /net/sole/opt/ICS/Motif1.2.4/usr/include
+# /net/vapor/3rd/motif-1.2.2-sol2/ICS/Motif/usr/include
+
+XINCLUDES=-I/usr/X11R6/include
+
+TKLIB=-L/usr/X11R6/lib -lXm
+XTLIB=-lXt
+XLIB= -lXpm -lXext -lX11
+
+SET_LIBRARY_PATH= \
+  LD_LIBRARY_PATH=/usr/X11R6/lib:/lib:/usr/lib:/usr/i486-linux/lib; export LD_LIBRARY_PATH
+
+# for other Motif versions use
+# /net/sole/opt/ICS/Motif1.2.4/usr/lib:/usr/lib
+# /net/vapor/3rd/motif-1.2.2-sol2/ICS/Motif/usr/lib:/usr/lib
+
+PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS)
+
+# from here on this file should be the same as Makefile.sun4-svr4-ol
+
+MOTIFXTRAS=
+
+PICFLAGS = -fPIC
+SHAREFLAGS = -shared
+MAKE_SHARED = ld
+STD_DEFINES = 
+AR = ar cq
+
+ICS-PRODUCT-OBJS = 
+ICS-PRODUCT-FASLS = 
+
+include Makefile.generic
diff --git a/Makefile.sunx86 b/Makefile.sunx86
index c4f5408a..4bf813e0 100644
--- a/Makefile.sunx86
+++ b/Makefile.sunx86
@@ -8,7 +8,7 @@ include Makefile.defs
 # temp hack for sole
 TMP=/tmp
 
-Makefile=Makefile.sun4-svr4
+Makefile=Makefile.sunx86
 
 # for other Motif versions use
 # /net/sole/opt/ICS/Motif1.2.4/usr/include
diff --git a/misc/compile-1.lisp b/misc/compile-1.lisp
index 98c9b40d..db18ddf9 100644
--- a/misc/compile-1.lisp
+++ b/misc/compile-1.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: user -*-
 ;;
-;;				-[Thu Nov 10 02:16:15 1994 by smh]-
+;;				-[Mon Mar 18 19:27:39 1996 by duane]-
 ;;
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -58,6 +58,7 @@
     (tenuring
      (excl:load-system sys))
 
+    #+ics
     (progn
       (excl:compile-system 'wnn :include-components t)
       (excl:load-system 'wnn))
diff --git a/tk/font.lisp b/tk/font.lisp
index ff236f31..4658e915 100644
--- a/tk/font.lisp
+++ b/tk/font.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: tk -*-
 ;;
-;;				-[]-
+;;				-[Sat Mar 23 17:50:57 1996 by duane]-
 ;;
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -134,6 +134,7 @@
 	    (setf (elt seq i) (char*-to-string (xfontname-list names i))))
 	(x11::xfreefontnames names)))))
 
+
 (defun list-font-names-with-info (display pattern &key (max-fonts 65535) (result-type 'list))
   (with-ref-par ((n 0 :int)
 		 (fonts 0 *))
-- 
GitLab