[backfire/packages] openntpd: merge r28620, r28621

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

diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile
index be01e000488783b15cc7cd9036aa3e771a49352c..f467e9750b14d06f072bbdc0d8ecdc02db291bb8 100644 (file)
--- a/libs/ustl/Makefile
+++ b/libs/ustl/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -12,19 +11,17 @@ PKG_NAME:=ustl
 PKG_VERSION:=0.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2
 PKG_SOURCE_URL:=@SF/ustl
 PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ustl
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C++ STL for embedded systems
+  DEPENDS:=@!TARGET_avr32
   URL:=http://ustl.sourceforge.net/
 endef
 
@@ -41,9 +38,9 @@ define Build/Configure
        $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CROSS="$(TARGET_CROSS)" \
                OPTFLAGS="$(TARGET_CFLAGS)" \
@@ -57,9 +54,9 @@ define Package/ustl/install
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(1)/usr/lib/
 endef