package: get rid of editors subdir

Not much point in a seperate subdir for only four packages.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

package/Config.in

@@ -465,14 +465,14 @@ endif
 endmenu
 
 menu "Text editors and viewers"
-source "package/editors/ed/Config.in"
+source "package/ed/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/less/Config.in"
 endif
-source "package/editors/nano/Config.in"
-source "package/editors/uemacs/Config.in"
+source "package/nano/Config.in"
+source "package/uemacs/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/editors/vim/Config.in"
+source "package/vim/Config.in"
 endif
 endmenu
 

package/editors/ed/ed.mk → package/ed/ed.mk

@@ -7,4 +7,4 @@ ED_VERSION:=1.1
 ED_SOURCE:=ed-$(ED_VERSION).tar.bz2
 ED_SITE:=$(BR2_GNU_MIRROR)/ed/
 
-$(eval $(call AUTOTARGETS,package/editors,ed))
+$(eval $(call AUTOTARGETS,package,ed))

package/editors/Config.in

@@ -1,9 +0,0 @@
-menu "Text editors"
-source "package/editors/ed/Config.in"
-source "package/editors/nano/Config.in"
-source "package/editors/uemacs/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-# busybox has vi
-source "package/editors/vim/Config.in"
-endif
-endmenu

package/editors/editors.mk

@@ -1 +0,0 @@
-include package/editors/*/*.mk

package/editors/uemacs/uemacs.mk → package/uemacs/uemacs.mk

@@ -18,7 +18,7 @@ uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
 
 $(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
 	$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(UEMACS_DIR) package/editors/uemacs/ uemacs\*.patch
+	toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
 	touch $(UEMACS_DIR)/.unpacked
 
 $(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked

package/editors/vim/vim.mk → package/vim/vim.mk

@@ -9,7 +9,7 @@ VIM_SITE:=http://ftp.vim.org/pub/vim
 VIM_SOURCE_SITE:=$(VIM_SITE)/unix
 VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1
 VIM_DIR:=$(BUILD_DIR)/vim71
-VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/$(VIM_VERSION).:' package/editors/vim/patches)
+VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/$(VIM_VERSION).:' package/vim/patches)
 VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
 VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk
 
@@ -31,7 +31,7 @@ $(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked
 		cd $(VIM_DIR); \
 		patch -p0 < $$i) \
 	done
-	toolchain/patch-kernel.sh $(VIM_DIR) package/editors/vim/ \*.patch
+	toolchain/patch-kernel.sh $(VIM_DIR) package/vim/ \*.patch
 	touch $@
 
 $(VIM_DIR)/.configured: $(VIM_DIR)/.patched