diff options
Diffstat (limited to 'ct-ng.in')
| -rw-r--r-- | ct-ng.in | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -17,9 +17,9 @@ export CT_TOP_DIR:=$(shell pwd) ifeq (@enable_local@,yes) # automake does not allow to set pkgxxxdir, they are always derived from # a respective xxxdir. So, for enable-local case, set them directly here. -export CT_LIB_DIR:=$(shell cd "@srcdir@" && pwd) -export CT_LIBEXEC_DIR:=$(CT_TOP_DIR)/kconfig -export CT_DOC_DIR:=$(CT_TOP_DIR)/docs +export CT_LIB_DIR:=$(dir $(CT_NG)) +export CT_LIBEXEC_DIR:=$(CT_LIB_DIR)/kconfig +export CT_DOC_DIR:=$(CT_LIB_DIR)/docs else # Paths and values set by ./configure # Don't bother to change it other than with a new ./configure! @@ -101,26 +101,29 @@ NCONF := $(CT_LIBEXEC_DIR)/nconf # TBD needed? We do supply the defconfig name explicitly below export srctree=$(CT_LIB_DIR) -.PHONY: menuconfig nconfig oldconfig savedefconfig defconfig +.PHONY: menuconfig nconfig oldconfig savedefconfig defconfig check-config -menuconfig: +check-config: + @[ ! -e .config -o -f .config ] || { echo ".config is not a regular file:"; ls -dl .config; exit 1; } >&2 + +menuconfig: check-config @$(CT_ECHO) " CONF $@" $(SILENT)$(MCONF) $(KCONFIG_TOP) -nconfig: +nconfig: check-config @$(CT_ECHO) " CONF $@" $(SILENT)$(NCONF) $(KCONFIG_TOP) -oldconfig: .config +oldconfig: .config check-config @$(CT_ECHO) " CONF $@" $(SILENT)$(sed) -i -r -f $(CT_LIB_DIR)/scripts/upgrade.sed $< $(SILENT)$(CONF) --silent$@ $(KCONFIG_TOP) -savedefconfig: .config +savedefconfig: .config check-config @$(CT_ECHO) ' GEN $@' $(SILENT)$(CONF) --savedefconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP) -defconfig: +defconfig: check-config @$(CT_ECHO) ' CONF $@' $(SILENT)$(CONF) --defconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP) @@ -229,7 +232,7 @@ source: .config $(SILENT)CT_SOURCE=y $(bash) $(CT_LIB_DIR)/scripts/crosstool-NG.sh build: .config - $(SILENT)BUILD_NCPUS=`@@CT_cpucount@@ 2>/dev/null || echo 0` \ + $(SILENT)BUILD_NCPUS=`@CPU_COUNT@ 2>/dev/null || echo 0` \ $(bash) $(CT_LIB_DIR)/scripts/crosstool-NG.sh build.%: |