From 39a42c68b0b76a37aadee82ba3830b150d86b389 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 20 Jul 2017 20:31:36 +1000
Subject: liboil libshout gstreamer and plugins: remove options now in
 MXE_DISABLE_DOC_OPTS

---
 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 +----
 src/liboil.mk           |  8 +++-----
 src/libshout.mk         | 10 +++++-----
 7 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk
index b65e706..1e8ca50 100644
--- a/src/gst-plugins-bad.mk
+++ b/src/gst-plugins-bad.mk
@@ -20,10 +20,7 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-examples \
-        --disable-opengl \
-        --mandir='$(BUILD_DIR)/sink' \
-        --docdir='$(BUILD_DIR)/sink' \
-        --with-html-dir='$(BUILD_DIR)/sink'
+        --disable-opengl
     $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk
index 0b12e2c..b79b68c 100644
--- a/src/gst-plugins-base.mk
+++ b/src/gst-plugins-base.mk
@@ -17,10 +17,7 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-examples \
-        --disable-x \
-        --mandir='$(BUILD_DIR)/sink' \
-        --docdir='$(BUILD_DIR)/sink' \
-        --with-html-dir='$(BUILD_DIR)/sink'
+        --disable-x
     $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk
index 98888a7..3934e14 100644
--- a/src/gst-plugins-good.mk
+++ b/src/gst-plugins-good.mk
@@ -23,10 +23,7 @@ define $(PKG)_BUILD
         --disable-examples \
         --disable-aalib \
         $(if $(BUILD_SHARED), --disable-shout2) \
-        --disable-x \
-        --mandir='$(BUILD_DIR)/sink' \
-        --docdir='$(BUILD_DIR)/sink' \
-        --with-html-dir='$(BUILD_DIR)/sink'
+        --disable-x
     $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
 
diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk
index 8a77431..fb67038 100644
--- a/src/gst-plugins-ugly.mk
+++ b/src/gst-plugins-ugly.mk
@@ -18,10 +18,7 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-examples \
-        --disable-opengl \
-        --mandir='$(BUILD_DIR)/sink' \
-        --docdir='$(BUILD_DIR)/sink' \
-        --with-html-dir='$(BUILD_DIR)/sink'
+        --disable-opengl
     $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
diff --git a/src/gstreamer.mk b/src/gstreamer.mk
index ea059c7..61088a5 100644
--- a/src/gstreamer.mk
+++ b/src/gstreamer.mk
@@ -23,10 +23,7 @@ define $(PKG)_BUILD
         --disable-debug \
         --disable-check \
         --disable-tests \
-        --disable-examples \
-        --mandir='$(BUILD_DIR)/sink' \
-        --docdir='$(BUILD_DIR)/sink' \
-        --with-html-dir='$(BUILD_DIR)/sink'
+        --disable-examples
     $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
diff --git a/src/liboil.mk b/src/liboil.mk
index ef0b351..078655a 100644
--- a/src/liboil.mk
+++ b/src/liboil.mk
@@ -23,13 +23,11 @@ endef
 # `as_cv_unaligned_access` so set it manually
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
         $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-examples \
-        --mandir='$(1)/sink' \
-        --docdir='$(1)/sink' \
-        --with-html-dir='$(1)/sink' \
         as_cv_unaligned_access=yes
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
diff --git a/src/libshout.mk b/src/libshout.mk
index c9ffb83..7afbbce 100644
--- a/src/libshout.mk
+++ b/src/libshout.mk
@@ -17,13 +17,13 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    # doesn't support out-of-tree builds
+    cd '$(SOURCE_DIR)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         ac_cv_prog_PKGCONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
-        --disable-thread \
-        --infodir='$(1)/sink' \
-        --mandir='$(1)/sink'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+        --disable-thread
+    $(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(SOURCE_DIR)' -j 1 install
 endef
 
 $(PKG)_BUILD_SHARED =
-- 
cgit v0.12