From 7b0ad787d6fb0e967e4ee938fffaf804cf433588 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 19 Sep 2007 20:13:08 +0000
Subject: - fixes and cleanups (Cristian Ionescu-Idbohrn)

---
 package/libvorbis/Config.in    |  7 ++++---
 package/libvorbis/libvorbis.mk | 13 ++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'package/libvorbis')

diff --git a/package/libvorbis/Config.in b/package/libvorbis/Config.in
index b84c45843..6ad0e2009 100644
--- a/package/libvorbis/Config.in
+++ b/package/libvorbis/Config.in
@@ -8,9 +8,10 @@ config BR2_PACKAGE_LIBVORBIS
 	  (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and
 	  variable bitrates from 16 to 128 kbps/channel.
 
-	  This places Vorbis in the same competitive class as audio representations
-	  such as MPEG-4 (AAC), and similar to, but higher performance than
-	  MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC.
+	  This places Vorbis in the same competitive class as audio
+	  representations such as MPEG-4 (AAC), and similar to, but higher
+	  performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ),
+	  WMA and PAC.
 
 
 config BR2_PACKAGE_LIBVORBIS_HEADERS
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index c244ad74b..7cb4938fd 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -19,11 +19,13 @@ $(LIBVORBIS_DIR)/.source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
 	touch $@
 
 $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
-	(cd $(LIBVORBIS_DIR); rm -rf config.cache ; \
+	(cd $(LIBVORBIS_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
+		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+		PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -34,7 +36,7 @@ $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
 		--enable-static \
 		--disable-oggtest \
 		$(DISABLE_NLS) \
-	);
+	)
 	touch $@
 
 $(LIBVORBIS_DIR)/.libs: $(LIBVORBIS_DIR)/.configured
@@ -51,7 +53,8 @@ $(TARGET_DIR)/usr/lib/libvorbis.a: $(TARGET_DIR)/usr/lib/libvorbis.so
 
 libvorbis-header: $(TARGET_DIR)/usr/lib/libvorbis.a
 	mkdir -p $(TARGET_DIR)/usr/include/vorbis
-	cp -dpf $(LIBVORBIS_DIR)/include/vorbis/*.h $(TARGET_DIR)/usr/include/vorbis
+	cp -dpf $(LIBVORBIS_DIR)/include/vorbis/*.h \
+		$(TARGET_DIR)/usr/include/vorbis
 
 libvorbis: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libvorbis.so
 
@@ -80,7 +83,7 @@ TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
 $(DL_DIR)/$(TREMOR_SOURCE):
 	(cd $(BUILD_DIR); \
 		svn co $(TREMOR_TRUNK); \
-		mv -af Tremor $(TREMOR_NAME); \
+		mv -f Tremor $(TREMOR_NAME); \
 		tar -cvf $(TREMOR_NAME).tar $(TREMOR_DIR); \
 		bzip2 $(TREMOR_NAME).tar; \
 		rm -fr $(TREMOR_DIR); \
-- 
cgit v1.2.3