Commit 97e461b1 authored by Bruce Momjian's avatar Bruce Momjian

Another tcl/tk fix.

parent df18ece0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
...@@ -161,10 +161,8 @@ USE_TCL= @USE_TCL@ ...@@ -161,10 +161,8 @@ USE_TCL= @USE_TCL@
# customize these to your site's needs # customize these to your site's needs
# #
TCL_INCDIR= @TCL_INCDIR@ TCL_INCDIR= @TCL_INCDIR@
TCL_LIBDIR= /usr/local/lib
TCL_LIB= @TCL_LIB@ TCL_LIB= @TCL_LIB@
TK_INCDIR= @TK_INCDIR@ TK_INCDIR= @TK_INCDIR@
TK_LIBDIR= /usr/local/lib
TK_LIB= @TK_LIB@ TK_LIB= @TK_LIB@
USE_PERL= @USE_PERL@ USE_PERL= @USE_PERL@
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 ...@@ -29,12 +29,12 @@ all: pgtclsh pgtksh
pgtclsh: pgtclAppInit.o pgtclsh: pgtclAppInit.o
$(CC) $(CFLAGS) -o $@ 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 pgtksh: pgtkAppInit.o
$(CC) $(CFLAGS) -o $@ pgtkAppInit.o \ $(CC) $(CFLAGS) -o $@ pgtkAppInit.o \
$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) $(X_LIBS) \ $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB) $(TCL_LIB) \
$(TK_LIB) $(TCL_LIB) $(X11_LIBS) -lm $(LDFLAGS) $(X11_LIBS) -lm $(LDFLAGS)
install: pgtclsh pgtksh install: pgtclsh pgtksh
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment