Commit6f1a507

committed

Clean up template names and remove LINUX_ELF hack. No longer

needed.

1 parentbe1d471 commit6f1a507Copy full SHA for 6f1a507

File tree

+10

-22

lines changed

+10

-22

lines changed

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,6 @@ AC_ARG_WITH(template,`
`87`	`87`	`])`
`88`	`88`	`AC_MSG_RESULT($TEMPLATE)`
`89`	`89`
`90`		`-if test "$TEMPLATE" = "linux-elf"; then`
`91`		`-LINUX_ELF=yes`
`92`		`-else`
`93`		`-LINUX_ELF=no`
`94`		`-fi`
`95`		`-AC_SUBST(LINUX_ELF)`
`96`		`-`
`97`	`90`	`export TEMPLATE`
`98`	`91`	`if test ! -f "template/$TEMPLATE"; then`
`99`	`92`	`echo ""`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.15 1998/05/24 03:48:58 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.16 1998/06/12 18:36:40 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -34,13 +34,10 @@ shlib :=`
`34`	`34`	`LIBPQ= -L$(SRCDIR)/interfaces/libpq -lpq`
`35`	`35`
`36`	`36`	`ifeq ($(PORTNAME), linux)`
`37`		`-LINUX_ELF=@LINUX_ELF@`
`38`		`- ifdef LINUX_ELF`
`39`		`-install-shlib-dep:= install-shlib`
`40`		`-shlib:= libpgtcl.so.1`
`41`		`-CFLAGS+=$(CFLAGS_SL)`
`42`		`-LDFLAGS_SL= -shared`
`43`		`- endif`
	`37`	`+install-shlib-dep:= install-shlib`
	`38`	`+shlib:= libpgtcl.so.1`
	`39`	`+CFLAGS+=$(CFLAGS_SL)`
	`40`	`+LDFLAGS_SL= -shared`
`44`	`41`	`endif`
`45`	`42`
`46`	`43`	`ifeq ($(PORTNAME), bsd)`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.18 1998/05/1221:44:02 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.19 1998/06/1218:36:42 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -32,12 +32,10 @@ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \`
`32`	`32`	`shlib :=`
`33`	`33`	`install-shlib-dep :=`
`34`	`34`	`ifeq ($(PORTNAME), linux)`
`35`		`- ifdef LINUX_ELF`
`36`		`-install-shlib-dep := install-shlib`
`37`		`-shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`38`		`-LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)`
`39`		`-CFLAGS +=$(CFLAGS_SL)`
`40`		`- endif`
	`35`	`+install-shlib-dep := install-shlib`
	`36`	`+shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
	`37`	`+LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)`
	`38`	`+CFLAGS +=$(CFLAGS_SL)`
`41`	`39`	`endif`
`42`	`40`	`ifeq ($(PORTNAME), bsd)`
`43`	`41`	`ifdef BSD_SHLIB`

Comments

(0)