diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-11-29 09:42:06 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-11-29 09:42:06 +0000 |
| commit | 8fadf7f6e0874fc6d935a27c728e5482e62fd75f (patch) | |
| tree | 9d9d388ccff15dad72050c89b1a8fa6b1b6936a4 | |
| parent | 90930209b4f29396c4ed1cd3a1f220cd625997f8 (diff) | |
| download | buildroot-novena-8fadf7f6e0874fc6d935a27c728e5482e62fd75f.tar.gz buildroot-novena-8fadf7f6e0874fc6d935a27c728e5482e62fd75f.zip | |
Ensure ogg lib is in staging dir
| -rw-r--r-- | package/libogg/libogg.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk index 461adab83..99bd14a5e 100644 --- a/package/libogg/libogg.mk +++ b/package/libogg/libogg.mk @@ -41,11 +41,16 @@ $(LIBOGG_DIR)/.configured: $(LIBOGG_DIR)/.source touch $@ $(LIBOGG_DIR)/.libs: $(LIBOGG_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(LIBOGG_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBOGG_DIR) touch $@ -$(TARGET_DIR)/usr/lib/libogg.so: $(LIBOGG_DIR)/.libs - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBOGG_DIR) install +$(STAGING_DIR)/usr/lib/libogg.so: $(LIBOGG_DIR)/.libs + mkdir -p $(STAGING_DIR) + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBOGG_DIR) install + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libogg.la + +$(TARGET_DIR)/usr/lib/libogg.so: $(STAGING_DIR)/usr/lib/libogg.so + cp -dpf $(STAGING_DIR)/usr/lib/libogg.so* $(TARGET_DIR)/usr/lib ifneq ($(strip $(BR2_HAVE_MANPAGES)),y) rm -rf $(TARGET_DIR)/usr/share/doc/$(LIBOGG_NAME) endif @@ -65,7 +70,8 @@ libogg: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libogg.so libogg-source: $(DL_DIR)/$(LIBOGG_SOURCE) libogg-clean: - $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBOGG_DIR) uninstall + -rm -rf $(TARGET_DIR)/usr/lib/libogg.so* + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBOGG_DIR) uninstall -$(MAKE) -C $(LIBOGG_DIR) clean libogg-dirclean: |