summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-23 09:55:17 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-23 09:55:17 +0000
commitc58114edf5c8e272b786bb4ec310ff9373b9f931 (patch)
treeddef599264c01746d49f4312de1a52a4566b9351
parent1e5e164a9b3cbc8a4e91cdffed61bf5ad8bbfa6f (diff)
downloadbuildroot-novena-c58114edf5c8e272b786bb4ec310ff9373b9f931.tar.gz
buildroot-novena-c58114edf5c8e272b786bb4ec310ff9373b9f931.zip
Do not use $(STAGING_DIR)/include for freetype, for now
-rw-r--r--package/freetype/freetype.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index fd0061573..f9fcce7b6 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -50,8 +50,9 @@ $(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured
$(STAGING_DIR)/usr/include/freetype:
ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype
-$(STAGING_DIR)/include/freetype:
- ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype
+#$(STAGING_DIR)/include/freetype:
+# mkdir -p $(STAGING_DIR)/include
+# ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype
$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install
@@ -96,7 +97,7 @@ freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so freetype-links
freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE)
-freetype-links: $(STAGING_DIR)/usr/include/freetype $(STAGING_DIR)/include/freetype
+freetype-links: $(STAGING_DIR)/usr/include/freetype # $(STAGING_DIR)/include/freetype
freetype-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall