From 2aa92300fd5630d60f181103fe2e7727487a4dbc Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 17 Jul 2013 08:25:43 +0200
Subject: docs/help: rename defconfig/olddefconfig into

After commit 15f57d843296e244487ac0845a73247f9d6749b8, the defconfig target
has been renamed into savedefconfig, and olddefconfig into defconfig. However,
the help text and man page was not updated.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
[yann.morin.1998@free.fr: rename CONFIG -> DEFCONFIG]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <0c1dff89c9ee1672693f.1374042343@BEANTN0L019720>
Patchwork-Id: 259601

diff --git a/docs/ct-ng.1.in b/docs/ct-ng.1.in
index 7526ccf..88388e1 100644
--- a/docs/ct-ng.1.in
+++ b/docs/ct-ng.1.in
@@ -60,7 +60,7 @@ Samples can be later recalled by calling
 with the target tuple they represent.
 ."
 .TP
-.B defconfig
+.B savedefconfig
 Save the current configuration to a mini-defconfig file, that contains only
 the strictly required symbols to reproduce the configuration. defconfig files
 are much smaller than a complete .config, so it is easy to send by mail. As
@@ -87,11 +87,11 @@ saved. Use
 for that
 ."
 .TP
-.B olddefconfig
+.B defconfig
 Configure
 .B crosstool-NG
 using a mini-defconfig file (previously saved with
-.B defconfig
+.B savedefconfig
 or manually edited). The default mini-defconfig is read from the file
 .IR defconfig ,
 unless the variable
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk
index bf69cbf..cb9f91c 100644
--- a/kconfig/kconfig.mk
+++ b/kconfig/kconfig.mk
@@ -29,11 +29,11 @@ oldconfig: .config
 
 savedefconfig: .config
 	@$(ECHO) '  GEN   $@'
-	$(SILENT)$(CONF) --savedefconfig=$${CONFIG-defconfig} $(KCONFIG_TOP)
+	$(SILENT)$(CONF) --savedefconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP)
 
 defconfig:
 	@$(ECHO) '  CONF  $@'
-	$(SILENT)$(CONF) --defconfig=$${CONFIG-defconfig} $(KCONFIG_TOP)
+	$(SILENT)$(CONF) --defconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP)
 
 # Always be silent, the stdout an be >.config
 extractconfig:
@@ -58,6 +58,6 @@ help-config::
 	@echo  '  oldconfig          - Update current config using a provided .config as base'
 	@echo  '  extractconfig      - Extract to stdout the configuration items from a'
 	@echo  '                       build.log file piped to stdin'
-	@echo  '  defconfig          - Save current config as a mini-defconfig to $${CONFIG}'
-	@echo  '  olddefconfig       - Update config from a mini-defconfig $${CONFIG}'
-	@echo  '                       (default: $${CONFIG}=./defconfig)'
+	@echo  '  savedefconfig      - Save current config as a mini-defconfig to $${DEFCONFIG}'
+	@echo  '  defconfig          - Update config from a mini-defconfig $${DEFCONFIG}'
+	@echo  '                       (default: $${DEFCONFIG}=./defconfig)'
-- 
cgit v0.10.2-6-g49f6