Another tcl/tk fix.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index de7a7d85e9d987d5fa7d360919082c0eb43497e8..b6d99b1ea511c6c6e8cf12baaa4e005b16529b40 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.35 1998/02/22 20:02:11 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.36 1998/03/23 04:07:59 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -161,10 +161,8 @@ USE_TCL= @USE_TCL@
 # customize these to your site's needs
 #
 TCL_INCDIR= @TCL_INCDIR@
-TCL_LIBDIR= /usr/local/lib
 TCL_LIB= @TCL_LIB@
 TK_INCDIR= @TK_INCDIR@
-TK_LIBDIR= /usr/local/lib
 TK_LIB= @TK_LIB@
 
 USE_PERL= @USE_PERL@

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 334c20fed790d33cf8f30cfcea0ddeb091d7a523..76cc6f85094e78a0c3ed5e932ef050b1a23425f6 100644 (file)
--- 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.11 1998/02/22 20:02:28 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.12 1998/03/23 04:08:05 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,12 +29,12 @@ all: pgtclsh pgtksh
 
 pgtclsh: pgtclAppInit.o
        $(CC) $(CFLAGS) -o $@ pgtclAppInit.o \
-         $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LDFLAGS)
+         $(LIBPGTCL) $(LIBPQ) $(TCL_LIB) -lm $(LDFLAGS)
 
 pgtksh: pgtkAppInit.o
        $(CC) $(CFLAGS) -o $@ pgtkAppInit.o \
-         $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) $(X_LIBS) \
-         $(TK_LIB) $(TCL_LIB) $(X11_LIBS) -lm $(LDFLAGS)
+         $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB) $(TCL_LIB) \
+         $(X11_LIBS) -lm $(LDFLAGS)
 
 install: pgtclsh pgtksh
        $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh