From c9e6bee8e72baeb0711c91b9371ce88a1c3c766c Mon Sep 17 00:00:00 2001
From: Pavel Vatagin <pavelvat@gmail.com>
Date: Mon, 2 Jan 2017 18:44:45 +0300
Subject: [PATCH] fix moving gstreamer dlls (#1288)

---
 src/gst-plugins-bad.mk  | 5 +++++
 src/gst-plugins-base.mk | 5 +++++
 src/gst-plugins-good.mk | 5 +++--
 src/gst-plugins-ugly.mk | 5 +++++
 src/gstreamer.mk        | 5 +++--
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk
index 476bff89..5ef74e7a 100644
--- a/src/gst-plugins-bad.mk
+++ b/src/gst-plugins-bad.mk
@@ -25,4 +25,9 @@ define $(PKG)_BUILD
         --docdir='$(1)/sink' \
         --with-html-dir='$(1)/sink'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
+
+    # some .dlls are installed to lib - no obvious way to change
+    $(if $(BUILD_SHARED),
+        mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/'
+    )
 endef
diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk
index 8135aea5..9f7b9b65 100644
--- a/src/gst-plugins-base.mk
+++ b/src/gst-plugins-base.mk
@@ -25,4 +25,9 @@ define $(PKG)_BUILD
         --docdir='$(1)/sink' \
         --with-html-dir='$(1)/sink'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
+
+    # some .dlls are installed to lib - no obvious way to change
+    $(if $(BUILD_SHARED),
+        mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/'
+    )
 endef
diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk
index fe251e4a..df35657b 100644
--- a/src/gst-plugins-good.mk
+++ b/src/gst-plugins-good.mk
@@ -33,6 +33,7 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
 
     # some .dlls are installed to lib - no obvious way to change
-    $(and $(BUILD_SHARED),
-    mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/')
+    $(if $(BUILD_SHARED),
+        mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/'
+    )
 endef
diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk
index 2a33edb7..e885e6e3 100644
--- a/src/gst-plugins-ugly.mk
+++ b/src/gst-plugins-ugly.mk
@@ -25,4 +25,9 @@ define $(PKG)_BUILD
         --docdir='$(1)/sink' \
         --with-html-dir='$(1)/sink'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
+
+    # some .dlls are installed to lib - no obvious way to change
+    $(if $(BUILD_SHARED),
+        mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/'
+    )
 endef
diff --git a/src/gstreamer.mk b/src/gstreamer.mk
index 5790273f..58d616c2 100644
--- a/src/gstreamer.mk
+++ b/src/gstreamer.mk
@@ -32,6 +32,7 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
     # some .dlls are installed to lib - no obvious way to change
-    $(and $(BUILD_SHARED),
-    mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/')
+    $(if $(BUILD_SHARED),
+        mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/'
+    )
 endef