Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: ulf at uclibc.org <ulf@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/libogg
Date: Thu, 29 Nov 2007 01:42:06 -0800 (PST)	[thread overview]
Message-ID: <20071129094206.203CE3004B@busybox.net> (raw)

Author: ulf
Date: 2007-11-29 01:42:06 -0800 (Thu, 29 Nov 2007)
New Revision: 20578

Log:
Ensure ogg lib is in staging dir

Modified:
   trunk/buildroot/package/libogg/libogg.mk


Changeset:
Modified: trunk/buildroot/package/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/libogg/libogg.mk	2007-11-29 08:17:45 UTC (rev 20577)
+++ trunk/buildroot/package/libogg/libogg.mk	2007-11-29 09:42:06 UTC (rev 20578)
@@ -41,11 +41,16 @@
 	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-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:

             reply	other threads:[~2007-11-29  9:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-29  9:42 ulf at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-11-30 12:34 [Buildroot] svn commit: trunk/buildroot/package/libogg ulf at uclibc.org
2008-06-16 11:16 jacmet at uclibc.org
2008-06-16 11:16 jacmet at uclibc.org
2008-06-16 11:25 jacmet at uclibc.org

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071129094206.203CE3004B@busybox.net \
    --to=ulf@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox