summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2007-01-10 23:54:35 +0000
committerEric Andersen <andersen@codepoet.org>2007-01-10 23:54:35 +0000
commit4c283aa793ceb1e470f6423a5d5ef7d7c4c8a1dc (patch)
tree7ba2591bebae76f4c7e18b39fefb2aac2040245c
parentb700650ed20d36b30efb4132c757fb7975442380 (diff)
downloadbuildroot-novena-4c283aa793ceb1e470f6423a5d5ef7d7c4c8a1dc.tar.gz
buildroot-novena-4c283aa793ceb1e470f6423a5d5ef7d7c4c8a1dc.zip
fixup freetype build and install locations
-rw-r--r--package/freetype/freetype.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 229278e77..d397c5a77 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -26,22 +26,22 @@ $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=$(STAGING_DIR)/usr );
+ --prefix=$(STAGING_DIR) );
touch $(FREETYPE_DIR)/.configured
$(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured
$(MAKE) -C $(FREETYPE_DIR)
touch $(FREETYPE_DIR)/.compiled
-$(STAGING_DIR)/usr/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
+$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
$(MAKE) -C $(FREETYPE_DIR) install
touch -c $(STAGING_DIR)/lib/libfreetype.so
-$(TARGET_DIR)/usr/lib/libfreetype.so: $(STAGING_DIR)/usr/lib/libfreetype.so
- cp -dpf $(STAGING_DIR)/usr/lib/libfreetype.so* $(TARGET_DIR)/usr/lib/
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libfreetype.so
+$(TARGET_DIR)/lib/libfreetype.so: $(STAGING_DIR)/lib/libfreetype.so
+ cp -dpf $(STAGING_DIR)/lib/libfreetype.so* $(TARGET_DIR)/lib/
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libfreetype.so
-freetype: uclibc $(TARGET_DIR)/usr/lib/libfreetype.so
+freetype: uclibc $(TARGET_DIR)/lib/libfreetype.so
freetype-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall