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

$(STAGING_DIR)/usr/bin.

SVN-Revision: 12907

diff --git a/libs/ossp-js/Makefile b/libs/ossp-js/Makefile
index 95113524677bbec8b76ccf37870e3a5e47785c16..bb289d3da27996a24d01cda62b5d96b028b8c896 100644 (file)
--- a/libs/ossp-js/Makefile
+++ b/libs/ossp-js/Makefile
@@ -15,12 +15,12 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.ossp.org/pkg/lib/js/
 PKG_MD5SUM:=07f6cad7e03fd74a949588c3d4b333de
-
-PKG_BUILD_DEPENDS:= libreadline
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/js/Default
  TITLE:=Mozilla JavaScript Engine
  URL:=http://www.ossp.org/pkg/lib/js/
@@ -76,31 +76,43 @@ define Build/Configure
        $(call Build/Configure/Default)
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/js-config $(1)/usr/bin/
+       $(INSTALL_DIR) $(2)/bin
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/js-config \
+               $(2)/bin/
+       $(SED) \
+               's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+               $(2)/bin/js-config
+
        $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/js $(1)/usr/include/       
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/js \
+               $(1)/usr/include/
+
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjs.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/libjs.{la,so*} \
+               $(1)/usr/lib/
+
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/js.pc $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/js.pc \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/js/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/js $(1)/usr/bin/
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/js \
+               $(1)/usr/bin/
 endef
 
 define Package/libjs/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjs.so.* $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/libjs.so.* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,js))