X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=lang%2Fsablevm%2FMakefile;h=2ac81b6f12eeec7e43fc3aee77b8f140ccc59d6e;hp=9cc63e663a6c9cdec5cacb20c908f8b665041766;hb=647e9962e84c62fba6edae39e0dbe7d68a297089;hpb=c397c9e8ca3e6211002c3b51f4a6a6dcea2d9f2b

diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index 9cc63e663a..2ac81b6f12 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=sablevm
 PKG_VERSION:=1.13
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
 PKG_MD5SUM:=d5828200032bfe921dd43e450931e38c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,35 +27,33 @@ define Package/sablevm
   CATEGORY:=Languages
   DEPENDS:=+libffi-sable +libltdl +libpopt +libpthread +zlib
   TITLE:=A Java Virtual Machine (JVM) implementation
-  DESCRIPTION:=SableVM is a robust, extremely portable, efficient, and specifications-\\\
-    -compliant Java virtual machine that aims to be easy to maintain and to \\\
-    extend. It features a state-of-the-art and efficient interpreter engine.\\\
-    Its source code is very accessible and easy to understand. It also has \\\
-    many robustness features that have been the object of careful design.
+  DESCRIPTION:=\
+	SableVM is a robust, extremely portable, efficient, and specifications-\\\
+	-compliant Java virtual machine that aims to be easy to maintain and to \\\
+	extend. It features a state-of-the-art and efficient interpreter engine.\\\
+	Its source code is very accessible and easy to understand. It also has \\\
+	many robustness features that have been the object of careful design.
   URL:=http://sablevm.org/
 endef
 
 
 define Build/Configure
-  $(call Build/Configure/Default, \
-	--enable-shared \
-	--disable-static, \
-	LIBS="-lffi -lltdl -lpopt -lz" \
-  )
+	$(call Build/Configure/Default, \
+		, \
+		LIBS="-lffi -lltdl -lpopt -lz" \
+	)
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/sablevm/install
-	install -m0755 -d $(1)/usr/bin
+	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/
-	install -m0755 -d $(1)/usr/lib
+	install -d -m0755 $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/
 endef