From c76e2a97ec40b7c951a6c919cf2ef4603da3f015 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer
Date: Wed, 19 Sep 2007 20:22:58 +0000
Subject: - add a SVN_UP command for updating an already checked-out tree

---
 package/libvorbis/libvorbis.mk | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'package/libvorbis')

diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 7cb4938fd..a31d083e3 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -82,11 +82,11 @@ TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
 
 $(DL_DIR)/$(TREMOR_SOURCE):
 	(cd $(BUILD_DIR); \
-		svn co $(TREMOR_TRUNK); \
+		$(SVN_CO) $(TREMOR_TRUNK); \
 		mv -f Tremor $(TREMOR_NAME); \
 		tar -cvf $(TREMOR_NAME).tar $(TREMOR_DIR); \
 		bzip2 $(TREMOR_NAME).tar; \
-		rm -fr $(TREMOR_DIR); \
+		rm -rf $(TREMOR_DIR); \
 		mv $(TREMOR_NAME).tar.bz2 $(DL_DIR)/$(TREMOR_SOURCE); \
 	)
 
@@ -99,9 +99,6 @@ $(TREMOR_DIR)/.configured: $(TREMOR_DIR)/.source
 		$(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) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -150,13 +147,12 @@ tremor-dirclean:
 #
 ############################################################
 ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS)),y)
-ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS)),y)
+ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS_TREMOR)),y)
 TARGETS+=tremor
-else
-TARGETS+=libvorbis
 endif
+TARGETS+=libvorbis
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS_HEADERS)),y)
- TARGETS+=libvorbis-header
+TARGETS+=libvorbis-header
 endif
-- 
cgit v1.2.3-55-g7522