Install opencdk-config to $(STAGING_DIR)/host/bin rather then

$(STAGING_DIR)/usr/bin.

SVN-Revision: 12917

diff --git a/libs/opencdk/Makefile b/libs/opencdk/Makefile
index 5fbddb0c466a0552fea6d130a7383a5ec84dbe76..4271cf19ebde34412a2cd287007be6faac5732dc 100644 (file)
--- a/libs/opencdk/Makefile
+++ b/libs/opencdk/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006, 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -22,6 +22,8 @@ PKG_MD5SUM:=813d62d7afe7b2c2d8f3df0a6c9d9331
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/libopencdk
   SECTION:=libs
   CATEGORY:=Libraries
@@ -48,24 +50,31 @@ define Build/Configure
        )
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(1)/usr/bin/
-       mkdir -p $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DIR) $(2)/bin
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/opencdk-config \
+               $(2)/bin/
+       $(SED) \
+               's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+               $(2)/bin/opencdk-config
+
+       $(INSTALL_DIR) $(1)/usr/include
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/opencdk.h \
+               $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{la,so*} \
+               $(1)/usr/lib/
 endef
 
 define Package/libopencdk/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libopencdk))