aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-09 15:18:27 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-09 16:00:07 +0000
commit202a85224c349df0a02f30d2d6b5bf42cda1b662 (patch)
treecc4c69413404547ecbaac6688f2e470a1d135d7f /Makefile
parent3ded0ba32465be4488d1558d5916c5501e39ec7b (diff)
downloadsyslinux-202a85224c349df0a02f30d2d6b5bf42cda1b662.tar.gz
syslinux-202a85224c349df0a02f30d2d6b5bf42cda1b662.tar.xz
syslinux-202a85224c349df0a02f30d2d6b5bf42cda1b662.zip
Makefile: Change default object directory
Instead of building all objects in 'obj' if no O= argument is specified on the make command line, create all the firmware object directories in the top-level of the source repository. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 57b1846c..c7a0127f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,13 +30,12 @@ topdir = $(CURDIR)
#
# The output directory can be customised by setting the O=/obj/path/
# variable when invoking make. If no value is specified the default
-# directory is 'obj'.
+# directory is the top-level of the Syslinux source.
#
ifeq ("$(origin O)", "command line")
OBJDIR := $(O)
else
- OBJDIR = $(CURDIR)/obj
- foo := $(shell mkdir -p $(OBJDIR) && /bin/true)
+ OBJDIR = $(topdir)
endif
# If the output directory does not exist we bail because that is the