Commit36f41c7

committed

Make tcl unknown configure from Makefile, not configure.

1 parent14536f5 commit36f41c7Copy full SHA for 36f41c7

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1175,9 +1175,6 @@ AC_OUTPUT(`
`1175`	`1175`	`src/GNUmakefile`
`1176`	`1176`	`src/Makefile.global`
`1177`	`1177`	`src/backend/port/Makefile`
`1178`		`- src/pl/tcl/modules/pltcl_listmod`
`1179`		`- src/pl/tcl/modules/pltcl_loadmod`
`1180`		`- src/pl/tcl/modules/pltcl_delmod`
`1181`	`1178`	`],`
`1182`	`1179`	`[`
`1183`	`1180`	`# Update timestamp for config.h (see Makefile.global)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.125 2001/05/09 19:57:33 momjian Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.126 2001/05/0920:19:30 momjian Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -125,6 +125,7 @@ krb_srvtab = @krb_srvtab@`
`125`	`125`
`126`	`126`	`TCL_CONFIG_SH = @TCL_CONFIG_SH@`
`127`	`127`	`TK_CONFIG_SH = @TK_CONFIG_SH@`
	`128`	`+TCLSH= @TCLSH@`
`128`	`129`
`129`	`130`	`have_docbook= @have_docbook@`
`130`	`131`	`DOCBOOKSTYLE= @DOCBOOKSTYLE@`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the pltcl shared object`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.28 2001/05/09 20:08:08 momjian Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.29 2001/05/09 20:19:30 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -93,7 +93,18 @@ endif`
`93`	`93`
`94`	`94`	`ifeq ($(TCL_SHARED_BUILD), 1)`
`95`	`95`
`96`		`-all:$(INFILES)`
	`96`	`+all:$(INFILES) tcl_unknown`
	`97`	`+`
	`98`	`+tcl_unknown:$(top_builddir)/src/Makefile.global\`
	`99`	`+modules/pltcl_loadmod.in\`
	`100`	`+modules/pltcl_delmod.in\`
	`101`	`+modules/pltcl_listmod.in`
	`102`	`+ifeq ($(enable_pltcl_unknown), yes)`
	`103`	`+sed -e 's/@TCLSH@/$(TCLSH)/g' modules/pltcl_loadmod.in > modules/pltcl_loadmod`
	`104`	`+sed -e 's/@TCLSH@/$(TCLSH)/g' modules/pltcl_delmod.in > modules/pltcl_delmod`
	`105`	`+sed -e 's/@TCLSH@/$(TCLSH)/g' modules/pltcl_listmod.in > modules/pltcl_listmod`
	`106`	`+chmod a+x modules/pltcl_loadmod modules/pltcl_delmod modules/pltcl_listmod`
	`107`	`+endif`
`97`	`108`
`98`	`109`	`pltcl$(DLSUFFIX): pltcl.o`
`99`	`110`

Comments

(0)