mirror of
https://github.com/postgres/postgres.git
synced 2025-06-23 14:01:44 +03:00
Clean up template names and remove LINUX_ELF hack. No longer
needed.
This commit is contained in:
@ -87,13 +87,6 @@ AC_ARG_WITH(template,
|
|||||||
])
|
])
|
||||||
AC_MSG_RESULT($TEMPLATE)
|
AC_MSG_RESULT($TEMPLATE)
|
||||||
|
|
||||||
if test "$TEMPLATE" = "linux-elf"; then
|
|
||||||
LINUX_ELF=yes
|
|
||||||
else
|
|
||||||
LINUX_ELF=no
|
|
||||||
fi
|
|
||||||
AC_SUBST(LINUX_ELF)
|
|
||||||
|
|
||||||
export TEMPLATE
|
export TEMPLATE
|
||||||
if test ! -f "template/$TEMPLATE"; then
|
if test ! -f "template/$TEMPLATE"; then
|
||||||
echo ""
|
echo ""
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# IDENTIFICATION
|
||||||
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.15 1998/05/24 03:48:58 scrappy Exp $
|
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.16 1998/06/12 18:36:40 momjian Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -34,13 +34,10 @@ shlib :=
|
|||||||
LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq
|
LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq
|
||||||
|
|
||||||
ifeq ($(PORTNAME), linux)
|
ifeq ($(PORTNAME), linux)
|
||||||
LINUX_ELF=@LINUX_ELF@
|
|
||||||
ifdef LINUX_ELF
|
|
||||||
install-shlib-dep := install-shlib
|
install-shlib-dep := install-shlib
|
||||||
shlib := libpgtcl.so.1
|
shlib := libpgtcl.so.1
|
||||||
CFLAGS += $(CFLAGS_SL)
|
CFLAGS += $(CFLAGS_SL)
|
||||||
LDFLAGS_SL = -shared
|
LDFLAGS_SL = -shared
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PORTNAME), bsd)
|
ifeq ($(PORTNAME), bsd)
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# IDENTIFICATION
|
||||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.18 1998/05/12 21:44:02 momjian Exp $
|
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.19 1998/06/12 18:36:42 momjian Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -32,12 +32,10 @@ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
|
|||||||
shlib :=
|
shlib :=
|
||||||
install-shlib-dep :=
|
install-shlib-dep :=
|
||||||
ifeq ($(PORTNAME), linux)
|
ifeq ($(PORTNAME), linux)
|
||||||
ifdef LINUX_ELF
|
|
||||||
install-shlib-dep := install-shlib
|
install-shlib-dep := install-shlib
|
||||||
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
||||||
LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
|
LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
|
||||||
CFLAGS += $(CFLAGS_SL)
|
CFLAGS += $(CFLAGS_SL)
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(PORTNAME), bsd)
|
ifeq ($(PORTNAME), bsd)
|
||||||
ifdef BSD_SHLIB
|
ifdef BSD_SHLIB
|
||||||
|
Reference in New Issue
Block a user