]> granicus.if.org Git - postgresql/commitdiff
Copy the libpq DLL to the bin directory on Mingw and Cygwin.
authorAndrew Dunstan <andrew@dunslane.net>
Sat, 1 Feb 2014 20:16:29 +0000 (15:16 -0500)
committerAndrew Dunstan <andrew@dunslane.net>
Sat, 1 Feb 2014 20:16:29 +0000 (15:16 -0500)
This has long been done by the MSVC build system, and has caused
confusion in the past when programs like psql have failed to start
because they can't find the DLL. If it's in the same directory as it now
will be they will find it.

Backpatch to all live branches.

src/interfaces/libpq/Makefile

index c0c0eb41ff9e8a8d2b57ee14644c4f4b47f97e65..5640d8b1a9dd3e81e11ab2be986ce4a0ea07bd82 100644 (file)
@@ -120,9 +120,15 @@ install: all installdirs install-lib
        $(INSTALL_DATA) $(srcdir)/libpq-int.h '$(DESTDIR)$(includedir_internal)'
        $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h '$(DESTDIR)$(includedir_internal)'
        $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample '$(DESTDIR)$(datadir)/pg_service.conf.sample'
+ifneq (,$findstring($(PORTNAME), win32 cygwin))
+       $(INSTALL_DATA) $(shlib) '$(DESTDIR)$(bindir)/$(shlib)'
+endif
 
 installdirs: installdirs-lib
        $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)'
+ifneq (,$findstring($(PORTNAME), win32 cygwin))
+       $(MKDIR_P) '$(DESTDIR)$(bindir)'
+endif
 
 uninstall: uninstall-lib
        rm -f '$(DESTDIR)$(includedir)/libpq-fe.h'
@@ -130,6 +136,9 @@ uninstall: uninstall-lib
        rm -f '$(DESTDIR)$(includedir_internal)/libpq-int.h'
        rm -f '$(DESTDIR)$(includedir_internal)/pqexpbuffer.h'
        rm -f '$(DESTDIR)$(datadir)/pg_service.conf.sample'
+ifneq (,$findstring($(PORTNAME), win32 cygwin))
+       rm -f '$(DESTDIR)$(bindir)/$(shlib)'
+endif
 
 clean distclean: clean-lib
        rm -f $(OBJS) pthread.h libpq.rc