Skip to content
Snippets Groups Projects
Commit d587298b authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

Copy the libpq DLL to the bin directory on Mingw and Cygwin.

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.
parent d0ee9379
Branches
Tags
No related merge requests found
...@@ -121,12 +121,18 @@ install: all installdirs install-lib ...@@ -121,12 +121,18 @@ install: all installdirs install-lib
$(INSTALL_DATA) $(srcdir)/libpq-int.h '$(DESTDIR)$(includedir_internal)' $(INSTALL_DATA) $(srcdir)/libpq-int.h '$(DESTDIR)$(includedir_internal)'
$(INSTALL_DATA) $(srcdir)/pqexpbuffer.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' $(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
installcheck: installcheck:
$(MAKE) -C test $@ $(MAKE) -C test $@
installdirs: installdirs-lib installdirs: installdirs-lib
$(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' '$(DESTDIR)$(datadir)' $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' '$(DESTDIR)$(datadir)'
ifneq (,$findstring($(PORTNAME), win32 cygwin))
$(MKDIR_P) '$(DESTDIR)$(bindir)'
endif
uninstall: uninstall-lib uninstall: uninstall-lib
rm -f '$(DESTDIR)$(includedir)/libpq-fe.h' rm -f '$(DESTDIR)$(includedir)/libpq-fe.h'
...@@ -134,6 +140,9 @@ uninstall: uninstall-lib ...@@ -134,6 +140,9 @@ uninstall: uninstall-lib
rm -f '$(DESTDIR)$(includedir_internal)/libpq-int.h' rm -f '$(DESTDIR)$(includedir_internal)/libpq-int.h'
rm -f '$(DESTDIR)$(includedir_internal)/pqexpbuffer.h' rm -f '$(DESTDIR)$(includedir_internal)/pqexpbuffer.h'
rm -f '$(DESTDIR)$(datadir)/pg_service.conf.sample' rm -f '$(DESTDIR)$(datadir)/pg_service.conf.sample'
ifneq (,$findstring($(PORTNAME), win32 cygwin))
rm -f '$(DESTDIR)$(bindir)/$(shlib)'
endif
clean distclean: clean-lib clean distclean: clean-lib
$(MAKE) -C test $@ $(MAKE) -C test $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment