mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 07:10:12 +08:00
2f56fdad4b
* [libpq] Install msys2 autoconf-archive * Install msys2 zic tool * Fix zstd patching * Always build as if cross compiling * Enable feature client for non-windows * Cleanup (WIP) * Cleanup (WIP) * Update portfile.cmake * WIP * WIP * WIP * WIP * [libxslt] Fix pc files * WIP * WIP: Test libpq[all] * WIP * Update to 15.3 * Move patches * Revert "WIP: Test libpq[all]" * Fix install * Skip import libs for plugins * Full CI
37 lines
886 B
Diff
37 lines
886 B
Diff
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
|
|
index 16255d7..51e9ed2 100644
|
|
--- a/src/Makefile.shlib
|
|
+++ b/src/Makefile.shlib
|
|
@@ -85,7 +85,11 @@ else
|
|
# Naming convention for dynamically loadable modules
|
|
shlib = $(NAME)$(DLSUFFIX)
|
|
endif
|
|
+ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared)
|
|
+stlib = lib$(NAME).dll.a
|
|
+else
|
|
stlib = lib$(NAME).a
|
|
+endif
|
|
|
|
ifndef soname
|
|
# additional flags for backend modules
|
|
@@ -468,6 +472,9 @@ endif
|
|
else # no soname
|
|
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
|
|
endif
|
|
+ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared)
|
|
+ mv '$(DESTDIR)$(libdir)/$(shlib)' '$(DESTDIR)$(libdir)/../bin/$(shlib)'
|
|
+endif
|
|
|
|
|
|
installdirs-lib:
|
|
@@ -476,6 +483,9 @@ ifdef soname
|
|
else
|
|
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
|
|
endif
|
|
+ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared)
|
|
+ $(MKDIR_P) '$(DESTDIR)$(libdir)/../bin'
|
|
+endif
|
|
|
|
|
|
##
|