diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 0bf1952dbb9c8bb8f84a1a6f522706310fc60612..efa3b3376ae6a6c91786b3feb90a9f45fd68a716 100644
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.19 1998/10/12 02:40:58 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.20 1998/10/12 04:32:22 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@ include ../../Makefile.global
 #
 include Makefile.tcltkdefs
 
-CFLAGS+=  -I$(SRCDIR)/interfaces/libpgtcl 
+CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl 
 
 ifdef KRBVERS
 LDFLAGS+= $(KRBLIBS)
@@ -41,8 +41,8 @@ pgtclsh: pgtclAppInit.o
 
 pgtksh: pgtkAppInit.o
 	$(CC) $(CFLAGS) $(TK_DEFS) -o $@ pgtkAppInit.o \
-	  $(LIBPGTCL) $(LIBPQ) $(TK_LIB_SPEC) $(TK_LIBS) \
-	  $(TCL_LIB_SPEC) $(TCL_LIB) $(LDFLAGS)
+	  $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
+	  $(TCL_LIB_SPEC) $(TCL_LIB) $(X11_LIBS) $(LDFLAGS)
 
 install: pgtclsh pgtksh
 	$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
diff --git a/src/pl/plpgsql/src/mklang.sql b/src/pl/plpgsql/src/mklang.sql
index d68f5c336e9708661641206dea774167bb4cbcfe..4a27e1ef4c57a001711c278e887652b0dfbf37d0 100644
--- a/src/pl/plpgsql/src/mklang.sql
+++ b/src/pl/plpgsql/src/mklang.sql
@@ -1,11 +1,11 @@
 --
 -- PL/pgSQL language declaration
 --
--- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql,v 1.1 1998/08/24 19:14:48 momjian Exp $
+-- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql,v 1.2 1998/10/12 04:32:24 momjian Exp $
 --
 
 create function plpgsql_call_handler() returns opaque
-	as '/usr/local/pgsql/lib/plpgsql.so'
+	as '${exec_prefix}/lib/plpgsql.so'
 	language 'C';
 
 create trusted procedural language 'plpgsql'