From: Ted Hess <redacted>
Date: Sat, 28 Nov 2015 20:07:16 +0000 (-0500)
Subject: libshout: Fix build/configure errors
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=40c040abd4886f7b2013bb6c7cfa5c4af1f1d9f6;p=openwrt-packages.git

libshout: Fix build/configure errors

Signed-off-by: Ted Hess <redacted>
---

diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile
index 3a67c922e..4559ddf89 100644
--- a/libs/libshout/Makefile
+++ b/libs/libshout/Makefile
@@ -60,8 +60,8 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static
 
-ifeq ($(BUILD_VARIANT),full)
-  CONFIGURE_ARGS += --with-theora=no --with-speex=no
+ifeq ($(BUILD_VARIANT),nospeex)
+  CONFIGURE_ARGS += --disable-theora --disable-speex
 endif
 
 CONFIGURE_VARS += \
@@ -84,7 +84,7 @@ define Package/libshout/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.so.* $(1)/usr/lib/
 endef
-Package/libshout-full/install=Package/libshout/install
+Package/libshout-full/install=$(Package/libshout/install)
 
 $(eval $(call BuildPackage,libshout))
 $(eval $(call BuildPackage,libshout-full))