diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2015-01-18 22:36:40 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2015-01-18 22:36:40 -0500 |
| commit | cb4a3b0410d3ba19e4524fceee99fb9b10a5e08a (patch) | |
| tree | 5c487bf4c83df4b28dbb749f68e4ef2756738e25 | |
| parent | 75df6dc083f7a989697b5002a421fb204f2eeddb (diff) | |
| download | postgresql-cb4a3b0410d3ba19e4524fceee99fb9b10a5e08a.tar.gz postgresql-cb4a3b0410d3ba19e4524fceee99fb9b10a5e08a.zip | |
Install shared libraries also in bin on cygwin, mingw
This was previously only done for libpq, not it's done for all shared
libraries.
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
| -rw-r--r-- | src/Makefile.shlib | 7 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 674fe7e1d5e..739033f78e8 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -486,6 +486,9 @@ endif endif # not win32 endif # not cygwin endif # not aix +ifneq (,$(findstring $(PORTNAME),win32 cygwin)) + $(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)' +endif else # no soname $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)' endif @@ -493,7 +496,7 @@ endif installdirs-lib: ifdef soname - $(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)' + $(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)') else $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' endif @@ -509,7 +512,7 @@ ifdef soname rm -f '$(DESTDIR)$(libdir)/$(stlib)' rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \ '$(DESTDIR)$(libdir)/$(shlib_major)' \ - '$(DESTDIR)$(libdir)/$(shlib)' \ + '$(DESTDIR)$(libdir)/$(shlib)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)/$(shlib)') \ '$(DESTDIR)$(pkgconfigdir)/lib$(NAME).pc' else # no soname rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)' diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 3c23a5367a4..6973a204840 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -125,18 +125,12 @@ 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_SHLIB) $(shlib) '$(DESTDIR)$(bindir)/$(shlib)' -endif installcheck: $(MAKE) -C test $@ installdirs: installdirs-lib $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' '$(DESTDIR)$(datadir)' -ifneq (,$(findstring $(PORTNAME), win32 cygwin)) - $(MKDIR_P) '$(DESTDIR)$(bindir)' -endif uninstall: uninstall-lib rm -f '$(DESTDIR)$(includedir)/libpq-fe.h' @@ -144,9 +138,6 @@ 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 $(MAKE) -C test $@ |