Clean up template names and remove LINUX_ELF hack. No longer

needed.

diff --git a/src/configure.in b/src/configure.in
index b3b2d80abdec0aaa55cdd50e27ad58d472131330..aa65848bc678b325e7098fff60c5c88949875014 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -87,13 +87,6 @@ AC_ARG_WITH(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
 if test ! -f "template/$TEMPLATE"; then
        echo ""

diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index 969111eab87f9a770fd0acd5e5c2a838ca8f57f5..59caedf1c12851a77272eda34a7a2b5a350df536 100644 (file)
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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
 
 ifeq ($(PORTNAME), linux)
-  LINUX_ELF=@LINUX_ELF@
-  ifdef LINUX_ELF
-    install-shlib-dep  := install-shlib
-    shlib              := libpgtcl.so.1
-    CFLAGS             += $(CFLAGS_SL)
-    LDFLAGS_SL         = -shared
-  endif
+  install-shlib-dep    := install-shlib
+  shlib                := libpgtcl.so.1
+  CFLAGS               += $(CFLAGS_SL)
+  LDFLAGS_SL           = -shared
 endif
 
 ifeq ($(PORTNAME), bsd)

diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 5aa507e47a1dbdbc923ec6fbf895e221b9c67304..3cd5660c93c3c6de575ff886015ba22a3ffe188f 100644 (file)
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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 := 
 install-shlib-dep :=
 ifeq ($(PORTNAME), linux)
-  ifdef LINUX_ELF
-    install-shlib-dep := install-shlib
-    shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-    LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
-    CFLAGS += $(CFLAGS_SL)
-  endif
+  install-shlib-dep := install-shlib
+  shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+  LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
+  CFLAGS += $(CFLAGS_SL)
 endif
 ifeq ($(PORTNAME), bsd)
   ifdef BSD_SHLIB