diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-05-09 20:19:30 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-05-09 20:19:30 +0000 |
| commit | 36f41c71266fed3b498ef636aa24b3cad51ff169 (patch) | |
| tree | 218182d2a5831efb7a547e773aa07dd89181f877 | |
| parent | 14536f591d1916fd720fec346b809c7878063b3d (diff) | |
| download | postgresql-36f41c71266fed3b498ef636aa24b3cad51ff169.tar.gz postgresql-36f41c71266fed3b498ef636aa24b3cad51ff169.zip | |
Make tcl unknown configure from Makefile, not configure.
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 15 |
3 files changed, 15 insertions, 6 deletions
diff --git a/configure.in b/configure.in index f0484f4afb5..e2f90f9edba 100644 --- a/configure.in +++ b/configure.in @@ -1175,9 +1175,6 @@ AC_OUTPUT( src/GNUmakefile src/Makefile.global src/backend/port/Makefile - src/pl/tcl/modules/pltcl_listmod - src/pl/tcl/modules/pltcl_loadmod - src/pl/tcl/modules/pltcl_delmod ], [ # Update timestamp for config.h (see Makefile.global) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index e2cca9d5d09..b5155a74d59 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.125 2001/05/09 19:57:33 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.126 2001/05/09 20:19:30 momjian Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -125,6 +125,7 @@ krb_srvtab = @krb_srvtab@ TCL_CONFIG_SH = @TCL_CONFIG_SH@ TK_CONFIG_SH = @TK_CONFIG_SH@ +TCLSH = @TCLSH@ have_docbook = @have_docbook@ DOCBOOKSTYLE = @DOCBOOKSTYLE@ diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index f4133f78f9e..ac7c0ee4bd1 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.28 2001/05/09 20:08:08 momjian Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.29 2001/05/09 20:19:30 momjian Exp $ # #------------------------------------------------------------------------- @@ -93,7 +93,18 @@ endif ifeq ($(TCL_SHARED_BUILD), 1) -all: $(INFILES) +all: $(INFILES) tcl_unknown + +tcl_unknown: $(top_builddir)/src/Makefile.global \ + modules/pltcl_loadmod.in \ + modules/pltcl_delmod.in \ + modules/pltcl_listmod.in +ifeq ($(enable_pltcl_unknown), yes) + sed -e 's/@TCLSH@/$(TCLSH)/g' modules/pltcl_loadmod.in > modules/pltcl_loadmod + sed -e 's/@TCLSH@/$(TCLSH)/g' modules/pltcl_delmod.in > modules/pltcl_delmod + sed -e 's/@TCLSH@/$(TCLSH)/g' modules/pltcl_listmod.in > modules/pltcl_listmod + chmod a+x modules/pltcl_loadmod modules/pltcl_delmod modules/pltcl_listmod +endif pltcl$(DLSUFFIX): pltcl.o |