From db5f60cb1837d9d62d149f6f814d7069bdff9009 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 8 Apr 2008 09:50:29 +0000 Subject: [PATCH] On cygwin and win32, don't override the shlib name when building a module. Should fix regression test failures on those platforms. --- src/Makefile.shlib | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Makefile.shlib b/src/Makefile.shlib index a7d679ee597..4e795e32fe3 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.115 2008/04/07 23:08:15 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.116 2008/04/08 09:50:29 petere Exp $ # #------------------------------------------------------------------------- @@ -311,12 +311,16 @@ ifeq ($(PORTNAME), unixware) endif ifeq ($(PORTNAME), cygwin) - shlib = cyg$(NAME)$(DLSUFFIX) + ifdef SO_MAJOR_VERSION + shlib = cyg$(NAME)$(DLSUFFIX) + endif haslibarule = yes endif ifeq ($(PORTNAME), win32) - shlib = lib$(NAME)$(DLSUFFIX) + ifdef SO_MAJOR_VERSION + shlib = lib$(NAME)$(DLSUFFIX) + endif haslibarule = yes endif -- 2.39.5