projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
map: shorten autogenerated sub-interface names to account for limits
[openwrt.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
348e645
..
2b08d30
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,15
+11,15
@@
LC_ALL:=C
LANG:=C
export TOPDIR LC_ALL LANG
LANG:=C
export TOPDIR LC_ALL LANG
+empty:=
+space:= $(empty) $(empty)
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces))
+
world:
include $(TOPDIR)/include/host.mk
ifneq ($(OPENWRT_BUILD),1)
world:
include $(TOPDIR)/include/host.mk
ifneq ($(OPENWRT_BUILD),1)
- # XXX: these three lines are normally defined by rules.mk
- # but we can't include that file in this context
- empty:=
- space:= $(empty) $(empty)
_SINGLE=export MAKEFLAGS=$(space);
override OPENWRT_BUILD=1
_SINGLE=export MAKEFLAGS=$(space);
override OPENWRT_BUILD=1
@@
-50,7
+50,6
@@
printdb:
prepare: $(target/stamp-compile)
clean: FORCE
prepare: $(target/stamp-compile)
clean: FORCE
- $(_SINGLE)$(SUBMAKE) target/linux/clean
rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)
dirclean: clean
rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)
dirclean: clean
@@
-76,10
+75,10
@@
endif
# check prerequisites before starting to build
prereq: $(target/stamp-prereq) tmp/.prereq_packages
# check prerequisites before starting to build
prereq: $(target/stamp-prereq) tmp/.prereq_packages
- @if [ ! -f "$(INCLUDE_DIR)/site/$(
REAL_GNU_TARGET_NAME
)" ]; then \
- echo 'ERROR: Missing site config for
target "$(REAL_GNU_TARGET_NAME
)" !'; \
+ @if [ ! -f "$(INCLUDE_DIR)/site/$(
ARCH
)" ]; then \
+ echo 'ERROR: Missing site config for
architecture "$(ARCH
)" !'; \
echo ' The missing file will cause configure scripts to fail during compilation.'; \
echo ' The missing file will cause configure scripts to fail during compilation.'; \
- echo ' Please provide a "$(INCLUDE_DIR)/site/$(
REAL_GNU_TARGET_NAME
)" file and restart the build.'; \
+ echo ' Please provide a "$(INCLUDE_DIR)/site/$(
ARCH
)" file and restart the build.'; \
exit 1; \
fi
exit 1; \
fi