File tree Expand file tree Collapse file tree 2 files changed +5
-11
lines changed Expand file tree Collapse file tree 2 files changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -486,14 +486,17 @@ endif
486486endif # not win32
487487endif # not cygwin
488488endif # not aix
489+ ifneq (,$(findstring $(PORTNAME),win32 cygwin))
490+ $(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'
491+ endif
489492else # no soname
490493 $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
491494endif
492495
493496
494497installdirs-lib:
495498ifdef soname
496- $(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)'
499+ $(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)')
497500else
498501 $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
499502endif
@@ -509,7 +512,7 @@ ifdef soname
509512 rm -f '$(DESTDIR)$(libdir)/$(stlib)'
510513 rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \
511514 '$(DESTDIR)$(libdir)/$(shlib_major)' \
512- '$(DESTDIR)$(libdir)/$(shlib)' \
515+ '$(DESTDIR)$(libdir)/$(shlib)' $(if $(findstring $(PORTNAME),win32 cygwin),'$(DESTDIR)$(bindir)/$(shlib)') \
513516 '$(DESTDIR)$(pkgconfigdir)/lib$(NAME).pc'
514517else # no soname
515518 rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)'
Original file line number Diff line number Diff line change @@ -125,28 +125,19 @@ install: all installdirs install-lib
125125 $(INSTALL_DATA ) $(srcdir ) /libpq-int.h ' $(DESTDIR)$(includedir_internal)'
126126 $(INSTALL_DATA ) $(srcdir ) /pqexpbuffer.h ' $(DESTDIR)$(includedir_internal)'
127127 $(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
131128
132129installcheck :
133130 $(MAKE ) -C test $@
134131
135132installdirs : installdirs-lib
136133 $(MKDIR_P ) ' $(DESTDIR)$(includedir)' ' $(DESTDIR)$(includedir_internal)' ' $(DESTDIR)$(datadir)'
137- ifneq (,$(findstring $(PORTNAME ) , win32 cygwin) )
138- $(MKDIR_P) '$(DESTDIR)$(bindir)'
139- endif
140134
141135uninstall : uninstall-lib
142136 rm -f ' $(DESTDIR)$(includedir)/libpq-fe.h'
143137 rm -f ' $(DESTDIR)$(includedir)/libpq-events.h'
144138 rm -f ' $(DESTDIR)$(includedir_internal)/libpq-int.h'
145139 rm -f ' $(DESTDIR)$(includedir_internal)/pqexpbuffer.h'
146140 rm -f ' $(DESTDIR)$(datadir)/pg_service.conf.sample'
147- ifneq (,$(findstring $(PORTNAME ) , win32 cygwin) )
148- rm -f '$(DESTDIR)$(bindir)/$(shlib)'
149- endif
150141
151142clean distclean : clean-lib
152143 $(MAKE ) -C test $@
You can’t perform that action at this time.
0 commit comments