summaryrefslogtreecommitdiff
path: root/modules/Makefile
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-12-22 11:51:38 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-12-22 11:51:38 +0000
commit8821237240c5374d83298b2da5ad88fa1e3c1ef7 (patch)
treee1bc03fa83c61165f48ffe3f528ac5496332872a /modules/Makefile
parent38dcca25c8855c95649e3f0b5b09fae862ed5c7a (diff)
parent7307d60063ee4303da4de45f9d984fdc8df92146 (diff)
downloadsyslinux-8821237240c5374d83298b2da5ad88fa1e3c1ef7.tar.gz
Merge remote-tracking branch 'remotes/upstream/master' into baserock/morph
Diffstat (limited to 'modules/Makefile')
-rw-r--r--modules/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/Makefile b/modules/Makefile
index 9b50bb23..f878c70d 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -15,7 +15,8 @@
##
topdir = ..
-include $(topdir)/MCONFIG.embedded
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/embedded.mk
INCLUDES = -I$(com32)/include