Commitcb4a3b0

committed

Install shared libraries also in bin on cygwin, mingw

This was previously only done for libpq, not it's done for all sharedlibraries.Reviewed-by: Michael Paquier <michael.paquier@gmail.com>

1 parent75df6dc commitcb4a3b0Copy full SHA for cb4a3b0

File tree

-11

lines changed

-11

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -486,14 +486,17 @@ endif`
`486`	`486`	`endif # not win32`
`487`	`487`	`endif # not cygwin`
`488`	`488`	`endif # not aix`
	`489`	`+ifneq (,$(findstring $(PORTNAME),win32 cygwin))`
	`490`	`+$(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'`
	`491`	`+endif`
`489`	`492`	`else # no soname`
`490`	`493`	`$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'`
`491`	`494`	`endif`
`492`	`495`
`493`	`496`
`494`	`497`	`installdirs-lib:`
`495`	`498`	`ifdef soname`
`496`		`-$(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)'`
	`499`	`+$(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)')`
`497`	`500`	`else`
`498`	`501`	`$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'`
`499`	`502`	`endif`
`@@ -509,7 +512,7 @@ ifdef soname`
`509`	`512`	`rm -f '$(DESTDIR)$(libdir)/$(stlib)'`
`510`	`513`	`rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \`
`511`	`514`	`'$(DESTDIR)$(libdir)/$(shlib_major)' \`
`512`		`- '$(DESTDIR)$(libdir)/$(shlib)' \`
	`515`	`+ '$(DESTDIR)$(libdir)/$(shlib)'$(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)/$(shlib)')\`
`513`	`516`	`'$(DESTDIR)$(pkgconfigdir)/lib$(NAME).pc'`
`514`	`517`	`else # no soname`
`515`	`518`	`rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)'`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,28 +125,19 @@ install: all installdirs install-lib`
`125`	`125`	`$(INSTALL_DATA)$(srcdir)/libpq-int.h'$(DESTDIR)$(includedir_internal)'`
`126`	`126`	`$(INSTALL_DATA)$(srcdir)/pqexpbuffer.h'$(DESTDIR)$(includedir_internal)'`
`127`	`127`	`$(INSTALL_DATA)$(srcdir)/pg_service.conf.sample'$(DESTDIR)$(datadir)/pg_service.conf.sample'`
`128`		`-ifneq (,$(findstring$(PORTNAME), win32 cygwin))`
`129`		`-$(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(bindir)/$(shlib)'`
`130`		`-endif`
`131`	`128`
`132`	`129`	`installcheck:`
`133`	`130`	`$(MAKE) -Ctest$@`
`134`	`131`
`135`	`132`	`installdirs: installdirs-lib`
`136`	`133`	`$(MKDIR_P)'$(DESTDIR)$(includedir)''$(DESTDIR)$(includedir_internal)''$(DESTDIR)$(datadir)'`
`137`		`-ifneq (,$(findstring$(PORTNAME), win32 cygwin))`
`138`		`-$(MKDIR_P) '$(DESTDIR)$(bindir)'`
`139`		`-endif`
`140`	`134`
`141`	`135`	`uninstall: uninstall-lib`
`142`	`136`	`rm -f'$(DESTDIR)$(includedir)/libpq-fe.h'`
`143`	`137`	`rm -f'$(DESTDIR)$(includedir)/libpq-events.h'`
`144`	`138`	`rm -f'$(DESTDIR)$(includedir_internal)/libpq-int.h'`
`145`	`139`	`rm -f'$(DESTDIR)$(includedir_internal)/pqexpbuffer.h'`
`146`	`140`	`rm -f'$(DESTDIR)$(datadir)/pg_service.conf.sample'`
`147`		`-ifneq (,$(findstring$(PORTNAME), win32 cygwin))`
`148`		`-rm -f '$(DESTDIR)$(bindir)/$(shlib)'`
`149`		`-endif`
`150`	`141`
`151`	`142`	`cleandistclean: clean-lib`
`152`	`143`	`$(MAKE) -Ctest$@`

Comments

(0)