summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-04-24 13:15:30 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-04-24 13:15:30 +0000
commit3e6cd8a58ba2265b6e0e4d25fd19c37ca955ff0c (patch)
tree292f739c6583e880e9870b992bd6c4dc00c5a775
parent4cf1c1bb0fed3ba5e5a0ff84f0c4d9a4cc7a1786 (diff)
more options for expat, move install to /usr
-rw-r--r--package/expat/expat.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index be67e0373..8b05d55c4 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -35,8 +35,16 @@ $(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
+ --bindir=/bin \
+ --sbindir=/sbin \
+ --libdir=/lib \
+ --libexecdir=/lib \
--sysconfdir=/etc \
+ --datadir=/share \
--localstatedir=/var \
+ --includedir=/include \
+ --mandir=/man \
+ --infodir=/info \
--enable-shared \
)
touch $@
@@ -46,7 +54,7 @@ $(EXPAT_DIR)/$(EXPAT_BINARY): $(EXPAT_DIR)/.configured
touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
+ $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@