diff --git a/ChangeLog.n b/ChangeLog.n index 7285c1bf85900c8660274526e692c0c7f4380885..7d0a9510e7ca80fb5ee3ba624c84e77aa002765f 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,14 @@ If there are user-visible changes in this commit, then list the <standard changelog date stamp> * <changes go here...> +******************************************************************************* +2.2.2.21 + +2000-07-17 Kevin Layer <layer@ultra> + + * Makefile: remove SIXTYFOURBIT variable + * Makefile.hpprism: attempt to force clim to use motif 1.2 + ******************************************************************************* 2.2.2.20 diff --git a/Makefile b/Makefile index 219cc639068d195bc9707d4d8960ee4e8bc9485b..155467981a7f95ebed21846f10d1e5742b140b9d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile,v 1.89 2000/03/04 05:13:48 duane Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile,v 1.90 2000/07/17 19:59:05 layer Exp $ # If ../makefile.top doesn't exist, then you must specify HOST=xxx on the # `make' command line. @@ -6,8 +6,6 @@ include ../makefile.top include ../makefile.defs -SIXTYFOURBIT = $(shell cd ../src; make -s echo-64bit) - ifeq ($(OS_NAME),windows) HOST = windows endif diff --git a/Makefile.hpprism b/Makefile.hpprism index f0e10d736e2fece59155be2c1b5126fe46c707d3..70242e9d81786b3bb04effb97fc22fb640879948 100644 --- a/Makefile.hpprism +++ b/Makefile.hpprism @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.hpprism,v 1.17 2000/07/06 20:43:09 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.hpprism,v 1.18 2000/07/17 19:59:05 layer Exp $ # # Makefile.hpprism for CLIM 2.0 # @@ -21,7 +21,7 @@ STD_DEFINES = -DSYSV AR = ar clq #TKLIB=-lXm -TKLIB=/lib/libXm.3 +TKLIB=/lib/libXm.1 XTLIB=-lXt XLIB=-lX11 diff --git a/utils/packages.lisp b/utils/packages.lisp index 0738820f00571f18de2e809b32b94d24a793b1f2..46ea4bdbffd020f0a32bf1102f76d5ab85fa8213 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: packages.lisp,v 1.105 2000/07/08 04:56:34 duane Exp $ +;; $Id: packages.lisp,v 1.106 2000/07/17 19:59:05 layer Exp $ (in-package :common-lisp-user) @@ -3308,7 +3308,7 @@ (cl:defvar *clim-major-version* 2) (cl:defvar *clim-minor-version* 2) (cl:defvar *clim-generation-version* 2) -(cl:defvar *clim-build-version* 20) +(cl:defvar *clim-build-version* 21) (cl:defparameter *clim-version* (cl:format () "~d.~d.~d.~a"