more options for expat, move install to /usr

This commit is contained in:
John Voltz 2008-04-24 13:15:30 +00:00
parent 4cf1c1bb0f
commit 3e6cd8a58b

View File

@ -35,8 +35,16 @@ $(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--prefix=/usr \ --prefix=/usr \
--exec-prefix=/usr \ --exec-prefix=/usr \
--bindir=/bin \
--sbindir=/sbin \
--libdir=/lib \
--libexecdir=/lib \
--sysconfdir=/etc \ --sysconfdir=/etc \
--datadir=/share \
--localstatedir=/var \ --localstatedir=/var \
--includedir=/include \
--mandir=/man \
--infodir=/info \
--enable-shared \ --enable-shared \
) )
touch $@ touch $@
@ -46,7 +54,7 @@ $(EXPAT_DIR)/$(EXPAT_BINARY): $(EXPAT_DIR)/.configured
touch -c $@ touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY) $(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" \ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la $(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@ touch -c $@