aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2011-05-04 15:46:29 +0200
committerMichal Soltys <soltys@ziu.info>2011-05-04 15:46:29 +0200
commite4a46d8e86b3a14decc010d5cbd371922bdbb94b (patch)
treed58aabf4be68f2d83fad4252840cfb2888252f5b /Makefile
parent22411fad71c8949dbbe5880ae8a65043ca858872 (diff)
parentcf3ba289e440cc9e764243a02b8a474ebde70da7 (diff)
downloadsyslinux-e4a46d8e86b3a14decc010d5cbd371922bdbb94b.tar.gz
syslinux-e4a46d8e86b3a14decc010d5cbd371922bdbb94b.tar.xz
syslinux-e4a46d8e86b3a14decc010d5cbd371922bdbb94b.zip
Merge branch 'master' into chaindev
Conflicts: com32/Makefile com32/modules/chain.c Note: add ReactOS' stuff introduced in old chain.c Signed-off-by: Michal Soltys <soltys@ziu.info>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c4a24c40..a13da72a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,8 @@
# Main Makefile for SYSLINUX
#
topdir = .
-include $(topdir)/MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/syslinux.mk
-include $(topdir)/version.mk
#