X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Fnano%2FMakefile;h=2fbc96359538e1283e65526fa0aa8d8604bc76c9;hp=fd678c504afad9fb298f553ba9a8c42cbad88165;hb=5a17e713567f8902ea0df53660c03855c7dcf0f0;hpb=4c8955135037df556ee43ebda38379357a349f78;ds=sidebyside

diff --git a/utils/nano/Makefile b/utils/nano/Makefile
index fd678c504a..2fbc963595 100644
--- a/utils/nano/Makefile
+++ b/utils/nano/Makefile
@@ -11,12 +11,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nano
 PKG_VERSION:=1.3.8
 PKG_RELEASE:=1
-PKG_MD5SUM:=20633397bf5d462255f37dfcc7cad4e7
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ewtoo.org/~astyanax/nano/dist/v1.3 \
 	http://www.nano-editor.org/dist/v1.3
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=20633397bf5d462255f37dfcc7cad4e7
 PKG_CAT:=zcat
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
@@ -27,31 +28,31 @@ define Package/nano
   CATEGORY:=Utilities
   DEPENDS:=+libncurses
   TITLE:=An enhanced clone of the Pico text editor
-  DESCRIPTION:=GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor..
+  DESCRIPTION:=\
+	GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone \\\
+	of the Pico text editor..
   URL:=http://www.nano-editor.org/
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-                        --disable-static \
-                        --with-gnu-ld \
-                        --disable-rpath \
-                        --enable-tiny \
-                        --disable-glibtest \
-                        --disable-utf8 \
-                        --without-slang,ac_cv_header_regex_h=no)
+	$(call Build/Configure/Default, \
+		--enable-tiny \
+		--disable-glibtest \
+		--disable-utf8 \
+		--without-slang \
+		, \
+		ac_cv_header_regex_h=no \
+	)
 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/nano/install	
-	install -d -m0755 $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nano $(1)/usr/bin/
 endef