From 0c26484881b98bb42d292499e106d3597da0dab3 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 11 Jan 2007 07:25:01 +0000
Subject: fix dependancies and install paths

---
 package/expat/expat.mk | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'package')

diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 2b10d0bdd..d14d3674f 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -41,23 +41,27 @@ $(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked
 	);
 	touch  $(EXPAT_DIR)/.configured
 
-$(EXPAT_DIR)/.libs/libexpat.so.0.5.0: $(EXPAT_DIR)/.configured
+$(EXPAT_DIR)/.libs/libexpat.a: $(EXPAT_DIR)/.configured
 	$(MAKE) -C $(EXPAT_DIR) all
+	touch -c $(EXPAT_DIR)/.libs/libexpat.a
 
-$(STAGING_DIR)/lib/libexpat.so.0.5.0: $(EXPAT_DIR)/.libs/libexpat.so.0.5.0
-	$(MAKE) -C $(EXPAT_DIR) prefix=$(STAGING_DIR) exec_prefix=$(STAGING_DIR) mandir=$(STAGING_DIR)/man install
+$(STAGING_DIR)/lib/libexpat.so.1: $(EXPAT_DIR)/.libs/libexpat.a
+	$(MAKE) -C $(EXPAT_DIR) prefix=$(STAGING_DIR) \
+		exec_prefix=$(STAGING_DIR) mandir=$(STAGING_DIR)/man install
+	touch -c $(STAGING_DIR)/lib/libexpat.so.1
 
-$(TARGET_DIR)/usr/lib/libexpat.so.0.5.0: $(STAGING_DIR)/lib/libexpat.so.0.5.0
-	cp -dpf $(STAGING_DIR)/lib/libexpat.so* $(TARGET_DIR)/usr/lib/
-	cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libexpat.so.0.5.0
+$(TARGET_DIR)/lib/libexpat.so.1: $(STAGING_DIR)/lib/libexpat.so.1
+	cp -dpf $(STAGING_DIR)/lib/libexpat.so* $(TARGET_DIR)/lib/
+	#cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/bin/xmlwf
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libexpat.so.0.5.0
+	touch -c $(TARGET_DIR)/lib/libexpat.so.1
 
-expat: uclibc $(TARGET_DIR)/usr/lib/libexpat.so.0.5.0
+expat: uclibc $(TARGET_DIR)/lib/libexpat.so.1
 
 expat-clean:
 	rm -f $(EXPAT_DIR)/.configured
-	rm -f $(STAGING_DIR)/lib/libexpat.* $(TARGET_DIR)/usr/lib/libexpat.*
-	rm -f $(STAGING_DIR)/usr/bin/xmlwf  $(TARGET_DIR)/usr/bin/xmlwf
+	rm -f $(STAGING_DIR)/lib/libexpat.* $(TARGET_DIR)/lib/libexpat.*
+	#rm -f $(STAGING_DIR)/usr/bin/xmlwf  $(TARGET_DIR)/bin/xmlwf
 	-$(MAKE) -C $(EXPAT_DIR) clean
 
 #############################################################
-- 
cgit v1.2.3