Update empcd to 2008.02.16 (#3610)

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

diff --git a/libs/neon/Makefile b/libs/neon/Makefile
index 473c48238cf9c2a49ba26ea8008a33ec7be326c3..6932b1d8e4f0fe9e92558c7b100c1e8bcab7ae33 100644 (file)
--- a/libs/neon/Makefile
+++ b/libs/neon/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.webdav.org/neon/
 PKG_MD5SUM:=6e52cd9c03e372026d6eccbfb80f09ef
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libneon
@@ -38,20 +40,13 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
        LDFLAGS="$$$$LDFLAGS -lcrypto -lssl"
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
-
 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
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
        mkdir -p $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/
        mkdir -p $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/neon $(1)/usr/include/
        mkdir -p $(1)/usr/lib
@@ -62,13 +57,6 @@ define Build/InstallDev
        $(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/neon-config
 endef
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/neon-config \
-               $(STAGING_DIR)/usr/include/neon \
-               $(STAGING_DIR)/usr/lib/libneon.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/neon.pc
-endef
-
 define Package/libneon/install 
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.so.* $(1)/usr/lib/