fix xine-lib compile

[openwrt/svn-archive/archive.git] / libs / libsigc++ / Makefile

diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile
index 55beb3f43e4932aba7abe1b03b58e07ec2558618..a3104b8ee8d41edf9881578bde4a57250dd4689e 100644 (file)
--- a/libs/libsigc++/Makefile
+++ b/libs/libsigc++/Makefile
@@ -18,6 +18,8 @@ PKG_MD5SUM:=fde0ee69e3125e982746d9fe005763e1
 
 PKG_BUILD_DEPENDS:=libtool
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libsigcxx
@@ -45,7 +47,6 @@ CONFIGURE_VARS += \
 
 define Build/Configure
        $(call Build/Configure/Default,)
-       $(call libtool_disable_rpath)
        $(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib"|g' \
                $(PKG_BUILD_DIR)/libtool
        $(SED) 's|^postdeps=.*|postdeps=|g' $(PKG_BUILD_DIR)/libtool
@@ -53,29 +54,18 @@ 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
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/sigc++-2.0 $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigc-2.0.{a,so*} $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/sigc++-2.0 $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
-       $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/sigc++-2.0 \
-               $(STAGING_DIR)/usr/lib/libsigc-2.0.{a,so*} \
-               $(STAGING_DIR)/usr/lib/sigc++-2.0 \
-               $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
-               
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/sigc++-2.0 $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigc-2.0.{a,so*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/sigc++-2.0 $(1)/usr/lib/
+       mkdir -p $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc $(1)/usr/lib/pkgconfig/
+       $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/sigc++-2.0.pc
 endef
 
 define Package/libsigcxx/install