files installed incorrectly

[openwrt/svn-archive/archive.git] / libs / expat / Makefile

diff --git a/libs/expat/Makefile b/libs/expat/Makefile
index ba47bf6aa6d4848f018685dc8ba24d73953ef765..a377ab8edf547ee56c0edf94ef3f279f020647a7 100644 (file)
--- a/libs/expat/Makefile
+++ b/libs/expat/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=aff487543845a82fe262e6e2922b4c8e
 PKG_SOURCE_URL:=@SF/expat
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -31,19 +33,11 @@ define Package/libexpat/description
 endef
 
 
-PKG_CONFIGURE_ARGS += \
+CONFIGURE_ARGS += \
        --enable-shared \
-       --enable-static \
-
-
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
+       --enable-static
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
        $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
@@ -54,12 +48,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/expat{,_external}.h \
-               $(STAGING_DIR)/usr/lib/libexpat.{a,so*}
-endef
-
-
 define Package/libexpat/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/