revert commit 21832
authorJohn Voltz <john.voltz@gmail.com>
Thu, 24 Apr 2008 14:04:23 +0000 (14:04 -0000)
committerJohn Voltz <john.voltz@gmail.com>
Thu, 24 Apr 2008 14:04:23 +0000 (14:04 -0000)
package/expat/expat.mk

index 8b05d55c458bd8e7cb161ff7602a6923513a0973..be67e0373be4ab82a36f2aaa7ec48c2cf04c2099 100644 (file)
@@ -35,16 +35,8 @@ $(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 $@
@@ -54,7 +46,7 @@ $(EXPAT_DIR)/$(EXPAT_BINARY): $(EXPAT_DIR)/.configured
        touch -c $@
 
 $(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
-       $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
+       $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
        $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
                $(STAGING_DIR)/usr/lib/libexpat.la
        touch -c $@