summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredman <redman>1999-07-16 21:43:27 (GMT)
committerredman <redman>1999-07-16 21:43:27 (GMT)
commita79f675753a5cf6cff43be274950c36a70bbe295 (patch)
tree4f8b565ba625ce727831d04fecc6fc4f8fa26d2d
parentf22985bc43c82443ee7e1bea321e297562f29c61 (diff)
downloadtk-a79f675753a5cf6cff43be274950c36a70bbe295.zip
tk-a79f675753a5cf6cff43be274950c36a70bbe295.tar.gz
tk-a79f675753a5cf6cff43be274950c36a70bbe295.tar.bz2
* unix/Makefile.in:
* win/Makefile.in: Copy the prolog.ps from the generic directory for install-libraries. * unix/aclocal.m4: Check for Alpha/Linux to set the IEEE flag to the compiler to be -mieee. Patch from Don Porter.
-rw-r--r--ChangeLog9
-rw-r--r--unix/Makefile.in4
-rw-r--r--unix/aclocal.m416
-rw-r--r--win/Makefile.in4
4 files changed, 16 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index f4aaa54..4585fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-07-16 <redman@scriptics.com>
+
+ * unix/Makefile.in:
+ * win/Makefile.in: Copy the prolog.ps from the generic directory
+ for install-libraries.
+
+ * unix/aclocal.m4: Check for Alpha/Linux to set the IEEE flag to
+ the compiler to be -mieee. Patch from Don Porter.
+
1999-07-08 <stanton@scriptics.com>
* tests/unixSelect.test: Fixed broken test.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0d0c56e..90bcfbf 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.23 1999/07/13 22:19:06 redman Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.24 1999/07/16 21:43:28 redman Exp $
# Current Tk version; used in various names.
@@ -463,7 +463,7 @@ install-libraries:
echo "Installing $$i"; \
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
done;
- for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/prolog.ps \
+ for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
$(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4
index cfebd58..eb24967 100644
--- a/unix/aclocal.m4
+++ b/unix/aclocal.m4
@@ -1,15 +1,3 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
#------------------------------------------------------------------------
# SC_PATH_TCLCONFIG --
#
@@ -713,6 +701,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
LDFLAGS=""
LD_SEARCH_FLAGS=""])
fi
+ if test "`uname -m`" = "alpha" ; then
+ EXTRA_CFLAGS="-mieee"
+ fi
;;
MP-RAS-02*)
SHLIB_CFLAGS="-K PIC"
@@ -1704,4 +1695,3 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [
AC_SUBST(TCL_LIBS)
AC_SUBST(MATH_LIBS)
])
-
diff --git a/win/Makefile.in b/win/Makefile.in
index 8a3233c..c5ef920 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.6 1999/06/30 22:35:57 redman Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.7 1999/07/16 21:43:30 redman Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -378,7 +378,7 @@ install-libraries:
echo "Installing $$i"; \
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
done;
- @for i in $(ROOT_DIR)/library/*.tcl $(ROOT_DIR)/library/prolog.ps \
+ @for i in $(ROOT_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
$(ROOT_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \