--- rubberband-1.8.2.orig/Makefile.in	2018-06-13 18:45:07.834047200 -0400
+++ rubberband-1.8.2/Makefile.in	2018-06-13 18:58:36.823976100 -0400
@@ -30,20 +30,24 @@
 JNINAME			:= librubberband-jni
 JARNAME			:= rubberband.jar
 
-DYNAMIC_EXTENSION	:= .so
+LIBRARY_NAME		:= librubberband
+DYNAMIC_EXTENSION	:= .dll
 DYNAMIC_FULL_VERSION	:= 2.1.2
 DYNAMIC_ABI_VERSION	:= 2
-DYNAMIC_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,-soname=$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION)
+DYNAMIC_LIBNAME		:= $(LIBRARY_NAME)-${DYNAMIC_ABI_VERSION}$(DYNAMIC_EXTENSION)
+IMP_LIBNAME				:= $(LIBRARY_NAME)$(DYNAMIC_EXTENSION).a
+DYNAMIC_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--out-implib,lib/$(IMP_LIBNAME)
 VAMP_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--version-script=vamp/vamp-plugin.map
 LADSPA_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--version-script=ladspa/ladspa-plugin.map
 
 PROGRAM_TARGET 		:= bin/rubberband
 STATIC_TARGET  		:= lib/$(LIBNAME).a
-DYNAMIC_TARGET 		:= lib/$(LIBNAME)$(DYNAMIC_EXTENSION)
-JNI_TARGET		:= lib/$(JNINAME)$(DYNAMIC_EXTENSION)
+DYNAMIC_TARGET 		:= bin/$(DYNAMIC_LIBNAME)
+IMPL_TARGET    		:= lib/$(IMP_LIBNAME)
+JNI_TARGET		:= bin/$(JNINAME)$(DYNAMIC_EXTENSION)
 JAR_TARGET		:= lib/$(JARNAME)
-VAMP_TARGET    		:= lib/vamp-rubberband$(DYNAMIC_EXTENSION)
-LADSPA_TARGET  		:= lib/ladspa-rubberband$(DYNAMIC_EXTENSION)
+VAMP_TARGET    		:= bin/vamp-rubberband$(DYNAMIC_EXTENSION)
+LADSPA_TARGET  		:= bin/ladspa-rubberband$(DYNAMIC_EXTENSION)
 
 ALL_TARGETS			:= lib $(STATIC_TARGET) $(DYNAMIC_TARGET)
 
@@ -177,13 +181,10 @@
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR)
 	cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
 	cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
-	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION)
+	$(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR)
+	cp $(IMPL_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
 	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION)
-	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION)
-	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION)
-	ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION)
-	ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION)
-	test -f $(JNI_TARGET) && cp -f $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) || true
+	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_BINDIR)/$(DYNAMIC_LIBNAME)
 	sed "s,%PREFIX%,$(PREFIX)," rubberband.pc.in \
 	  > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
 ifeq ($(WITH_PROGRAMS), yes)
