Irix fixes from Murad Nayal

diff --git a/doc/src/FAQ.html b/doc/src/FAQ.html
index 9332793bf94a5a130de3863ca2da989974149737..4285490eeb3b4a00dd2c6cc89026414d7c101627 100644 (file)
--- a/doc/src/FAQ.html
+++ b/doc/src/FAQ.html
@@ -370,8 +370,8 @@ TODO</A> for a list of known bugs, missing features, and future plans.<P>
 There is a nice tutorial at <A
 HREF="http://w3.one.net/~jhoffman/sqltut.htm">
 http://w3.one.net/~jhoffman/sqltut.htm</A> and at <A
-HREF="http://ourworld.compuserve.com/homepages/Graeme_Bircall/HTM_COOK.HTM">
-http://ourworld.compuserve.com/homepages/Graeme_Birchall/HTM_COOK.HTM.</A><P>
+HREF="http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM">
+http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM.</A><P>
 
 Another one is "Teach Yourself SQL in 21 Days, Second Edition" at <A
 HREF="http://members.tripod.com/er4ebus/sql/index.htm">

diff --git a/src/interfaces/odbc/isqlext.h b/src/interfaces/odbc/isqlext.h
index df4fe54a1d341de9320888e12d52b76b7af6b161..b14b15af198a14eeee0e20db81633ebc843fff22 100644 (file)
--- a/src/interfaces/odbc/isqlext.h
+++ b/src/interfaces/odbc/isqlext.h
@@ -5,7 +5,7 @@
 #ifndef        _INTRINSIC_SQLEXT_H
 # define _INTRINSIC_SQLEXT_H
 
-# include      <isql.h>
+# include "isql.h"
 
 # define SQL_STILL_EXECUTING           2
 # define SQL_NEED_DATA                 99

diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index afd014b061e478c88dd4da08d05e2ff84a70dea3..65c4a058832bb4d80c3f981c3cc694e71d9572a7 100644 (file)
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the pltcl shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.12 2000/04/21 03:28:17 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.13 2000/05/22 23:56:44 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -66,7 +66,7 @@ CC = $(TCL_CC)
 # Instead use TCL's CFLAGS plus necessary -I directives.
 
 # Can choose either TCL_CFLAGS_OPTIMIZE or TCL_CFLAGS_DEBUG here, as needed
-CFLAGS= $(TCL_CFLAGS_OPTIMIZE)
+CFLAGS+= $(TCL_CFLAGS_OPTIMIZE)
 
 CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)