aboutsummaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-26 01:18:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-26 01:18:18 -0700
commitd5b9f24567a26562ec1822235cbd08256b96c335 (patch)
tree8e5a4c6245652d9b610c6308d3f505cdf9292919 /linux
parentfaf815967c276bab95989d22a62b8378d7ebf6f3 (diff)
parent5b726ddd81fd77947e126b14c84fb843b63544c5 (diff)
downloadsyslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.gz
syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.xz
syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.zip
Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'
Resolved Conflicts: com32/hdt/Makefile com32/sysdump/Makefile Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/Makefile b/linux/Makefile
index ffe22728..b9dac179 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -15,7 +15,8 @@
##
topdir = ..
-include $(topdir)/MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/syslinux.mk
OPTFLAGS = -g -O0 -Dalloca=malloc
INCLUDES = -I. -I.. -I../libinstaller