From 25cb2c332de8731ab58b0e606c757be410c872cc Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Fri, 16 Dec 2005 21:35:19 +0100
Subject: [PATCH] --- yaml --- r: 15891 b: refs/heads/master c:
 6f6046cff2e8f04d6b916b10ebaa7b40d7e7967a h: refs/heads/master i:   15889:
 85fc8ea04c16c68f9ed9aabf7ed7cb199d0bbb49   15887:
 5fec7bd9b8c92a6f0240bb72d4afeae9f85add01 v: v3

---
 [refs]                                               | 2 +-
 trunk/scripts/Makefile                               | 2 +-
 trunk/scripts/kconfig/Makefile                       | 3 ++-
 trunk/scripts/{ => kconfig}/lxdialog/BIG.FAT.WARNING | 0
 trunk/scripts/{ => kconfig}/lxdialog/Makefile        | 0
 trunk/scripts/{ => kconfig}/lxdialog/checklist.c     | 0
 trunk/scripts/{ => kconfig}/lxdialog/colors.h        | 0
 trunk/scripts/{ => kconfig}/lxdialog/dialog.h        | 0
 trunk/scripts/{ => kconfig}/lxdialog/inputbox.c      | 0
 trunk/scripts/{ => kconfig}/lxdialog/lxdialog.c      | 0
 trunk/scripts/{ => kconfig}/lxdialog/menubox.c       | 2 +-
 trunk/scripts/{ => kconfig}/lxdialog/msgbox.c        | 0
 trunk/scripts/{ => kconfig}/lxdialog/textbox.c       | 0
 trunk/scripts/{ => kconfig}/lxdialog/util.c          | 0
 trunk/scripts/{ => kconfig}/lxdialog/yesno.c         | 0
 trunk/scripts/kconfig/mconf.c                        | 2 +-
 16 files changed, 6 insertions(+), 5 deletions(-)
 rename trunk/scripts/{ => kconfig}/lxdialog/BIG.FAT.WARNING (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/Makefile (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/checklist.c (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/colors.h (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/dialog.h (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/inputbox.c (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/lxdialog.c (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/menubox.c (99%)
 rename trunk/scripts/{ => kconfig}/lxdialog/msgbox.c (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/textbox.c (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/util.c (100%)
 rename trunk/scripts/{ => kconfig}/lxdialog/yesno.c (100%)

diff --git a/[refs] b/[refs]
index b3bdb1393f49..12dfda333d5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e067e1f98d54d62fd598126f95e7684e5b63e67f
+refs/heads/master: 6f6046cff2e8f04d6b916b10ebaa7b40d7e7967a
diff --git a/trunk/scripts/Makefile b/trunk/scripts/Makefile
index 67763eeb8a3e..6f6b48f39f0a 100644
--- a/trunk/scripts/Makefile
+++ b/trunk/scripts/Makefile
@@ -19,4 +19,4 @@ subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-$(CONFIG_MODULES)     += mod
 
 # Let clean descend into subdirs
-subdir-	+= basic lxdialog kconfig package
+subdir-	+= basic kconfig package
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index 9d67782b812f..55bf95531f2f 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/scripts/kconfig/Makefile
@@ -11,7 +11,7 @@ gconfig: $(obj)/gconf
 	$< arch/$(ARCH)/Kconfig
 
 menuconfig: $(obj)/mconf
-	$(Q)$(MAKE) $(build)=scripts/lxdialog
+	$(Q)$(MAKE) $(build)=scripts/kconfig/lxdialog
 	$< arch/$(ARCH)/Kconfig
 
 config: $(obj)/conf
@@ -115,6 +115,7 @@ endif
 
 clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
 		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
+subdir- += lxdialog
 
 # Needed for systems without gettext
 KBUILD_HAVE_NLS := $(shell \
diff --git a/trunk/scripts/lxdialog/BIG.FAT.WARNING b/trunk/scripts/kconfig/lxdialog/BIG.FAT.WARNING
similarity index 100%
rename from trunk/scripts/lxdialog/BIG.FAT.WARNING
rename to trunk/scripts/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/trunk/scripts/lxdialog/Makefile b/trunk/scripts/kconfig/lxdialog/Makefile
similarity index 100%
rename from trunk/scripts/lxdialog/Makefile
rename to trunk/scripts/kconfig/lxdialog/Makefile
diff --git a/trunk/scripts/lxdialog/checklist.c b/trunk/scripts/kconfig/lxdialog/checklist.c
similarity index 100%
rename from trunk/scripts/lxdialog/checklist.c
rename to trunk/scripts/kconfig/lxdialog/checklist.c
diff --git a/trunk/scripts/lxdialog/colors.h b/trunk/scripts/kconfig/lxdialog/colors.h
similarity index 100%
rename from trunk/scripts/lxdialog/colors.h
rename to trunk/scripts/kconfig/lxdialog/colors.h
diff --git a/trunk/scripts/lxdialog/dialog.h b/trunk/scripts/kconfig/lxdialog/dialog.h
similarity index 100%
rename from trunk/scripts/lxdialog/dialog.h
rename to trunk/scripts/kconfig/lxdialog/dialog.h
diff --git a/trunk/scripts/lxdialog/inputbox.c b/trunk/scripts/kconfig/lxdialog/inputbox.c
similarity index 100%
rename from trunk/scripts/lxdialog/inputbox.c
rename to trunk/scripts/kconfig/lxdialog/inputbox.c
diff --git a/trunk/scripts/lxdialog/lxdialog.c b/trunk/scripts/kconfig/lxdialog/lxdialog.c
similarity index 100%
rename from trunk/scripts/lxdialog/lxdialog.c
rename to trunk/scripts/kconfig/lxdialog/lxdialog.c
diff --git a/trunk/scripts/lxdialog/menubox.c b/trunk/scripts/kconfig/lxdialog/menubox.c
similarity index 99%
rename from trunk/scripts/lxdialog/menubox.c
rename to trunk/scripts/kconfig/lxdialog/menubox.c
index 2d91880825ed..09512b544375 100644
--- a/trunk/scripts/lxdialog/menubox.c
+++ b/trunk/scripts/kconfig/lxdialog/menubox.c
@@ -58,7 +58,7 @@
 
 #include "dialog.h"
 
-#define ITEM_IDENT 4   /* Indent of menu entries. Fixed for all menus */
+#define ITEM_IDENT 1   /* Indent of menu entries. Fixed for all menus */
 static int menu_width;
 
 /*
diff --git a/trunk/scripts/lxdialog/msgbox.c b/trunk/scripts/kconfig/lxdialog/msgbox.c
similarity index 100%
rename from trunk/scripts/lxdialog/msgbox.c
rename to trunk/scripts/kconfig/lxdialog/msgbox.c
diff --git a/trunk/scripts/lxdialog/textbox.c b/trunk/scripts/kconfig/lxdialog/textbox.c
similarity index 100%
rename from trunk/scripts/lxdialog/textbox.c
rename to trunk/scripts/kconfig/lxdialog/textbox.c
diff --git a/trunk/scripts/lxdialog/util.c b/trunk/scripts/kconfig/lxdialog/util.c
similarity index 100%
rename from trunk/scripts/lxdialog/util.c
rename to trunk/scripts/kconfig/lxdialog/util.c
diff --git a/trunk/scripts/lxdialog/yesno.c b/trunk/scripts/kconfig/lxdialog/yesno.c
similarity index 100%
rename from trunk/scripts/lxdialog/yesno.c
rename to trunk/scripts/kconfig/lxdialog/yesno.c
diff --git a/trunk/scripts/kconfig/mconf.c b/trunk/scripts/kconfig/mconf.c
index d1ad40531ee5..d63d7fb677e4 100644
--- a/trunk/scripts/kconfig/mconf.c
+++ b/trunk/scripts/kconfig/mconf.c
@@ -325,7 +325,7 @@ static void cprint_init(void)
 	memset(args, 0, sizeof(args));
 	indent = 0;
 	child_count = 0;
-	cprint("./scripts/lxdialog/lxdialog");
+	cprint("./scripts/kconfig/lxdialog/lxdialog");
 	cprint("--backtitle");
 	cprint(menu_backtitle);
 }