From 558f0a30730b35d4901a047885231369e7c919a7 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Thu, 3 Jul 2008 08:14:54 +0000 Subject: [PATCH] Cleanup libvorbis, install in STAGING_DIR, courtesy Conrad Parker --- package/libvorbis/libvorbis.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk index 3e496d9388..6e72ad586f 100644 --- a/package/libvorbis/libvorbis.mk +++ b/package/libvorbis/libvorbis.mk @@ -40,12 +40,15 @@ $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source touch $@ $(LIBVORBIS_DIR)/.libs: $(LIBVORBIS_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(LIBVORBIS_DIR) + $(MAKE) -C $(@D) touch $@ -$(TARGET_DIR)/usr/lib/libvorbis.so: $(LIBVORBIS_DIR)/.libs - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBVORBIS_DIR) install - touch $@ +$(STAGING_DIR)/usr/lib/libvorbis.so: $(LIBVORBIS_DIR)/.libs + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBVORBIS_DIR) install + +$(TARGET_DIR)/usr/lib/libvorbis.so: $(STAGING_DIR)/usr/lib/libvorbis.so + $(INSTALL) -D $(STAGING_DIR)/usr/lib/libvorbis*.so* $(TARGET_DIR)/usr/lib + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libvorbis*.so* libvorbis: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/libvorbis.so -- 2.30.2