Commit cb4a3b04 authored by Peter Eisentraut's avatar Peter Eisentraut

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: default avatarMichael Paquier <michael.paquier@gmail.com>
parent 75df6dc0
...@@ -486,6 +486,9 @@ endif ...@@ -486,6 +486,9 @@ endif
endif # not win32 endif # not win32
endif # not cygwin endif # not cygwin
endif # not aix endif # not aix
ifneq (,$(findstring $(PORTNAME),win32 cygwin))
$(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'
endif
else # no soname else # no soname
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)' $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
endif endif
...@@ -493,7 +496,7 @@ endif ...@@ -493,7 +496,7 @@ endif
installdirs-lib: installdirs-lib:
ifdef soname ifdef soname
$(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)' $(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)')
else else
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)' $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
endif endif
...@@ -509,7 +512,7 @@ ifdef soname ...@@ -509,7 +512,7 @@ ifdef soname
rm -f '$(DESTDIR)$(libdir)/$(stlib)' rm -f '$(DESTDIR)$(libdir)/$(stlib)'
rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \ rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \
'$(DESTDIR)$(libdir)/$(shlib_major)' \ '$(DESTDIR)$(libdir)/$(shlib_major)' \
'$(DESTDIR)$(libdir)/$(shlib)' \ '$(DESTDIR)$(libdir)/$(shlib)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)/$(shlib)') \
'$(DESTDIR)$(pkgconfigdir)/lib$(NAME).pc' '$(DESTDIR)$(pkgconfigdir)/lib$(NAME).pc'
else # no soname else # no soname
rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)' rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)'
......
...@@ -125,18 +125,12 @@ install: all installdirs install-lib ...@@ -125,18 +125,12 @@ 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_SHLIB) $(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'
...@@ -144,9 +138,6 @@ uninstall: uninstall-lib ...@@ -144,9 +138,6 @@ 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 $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment