Commit 2691d808 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Makefile: fix make <blah>_defconfig 



Make sure we only pass O=<path> if we were originally called like that,
otherwise we might end up looking for the .config in the wrong place.

Likewise, when changing between using O= or not (or simply running
make <blah>_defconfig in a pristine source tree), we do end up having
a .config, but no .config.cmd. It isn't really critical so just continue
even if we couldn't read it.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b8cca06b

Makefile

+5 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ include package/Makefile.in 
all: world



# In this section, we need .config

include $(CONFIG_DIR)/.config.cmd

-include $(CONFIG_DIR)/.config.cmd



# We also need the various per-package makefiles, which also add

# each selected package to TARGETS if that package was selected
@@ -587,7 +587,11 @@ flush: 


%_defconfig: $(TOPDIR)/configs/%_defconfig

	cp $^ $(CONFIG_DIR)/.config

ifeq ($(O),output)

	@$(MAKE) oldconfig

else

	@$(MAKE) O=$(O) oldconfig

endif



configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config