aboutsummaryrefslogtreecommitdiffstats
path: root/lzo
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:46:34 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:46:34 +0100
commit10d05cbef13345ef3730234c1da7b0a34cdca9b6 (patch)
treed5a582d888db9c2dc360c9005c133b713f248e55 /lzo
parent844e965443e08133a7a366a496d8cc52ef93ca48 (diff)
parentd7d20a78c72237f85d8508c93aa411529d0ac17a (diff)
downloadsyslinux-10d05cbef13345ef3730234c1da7b0a34cdca9b6.tar.gz
syslinux-10d05cbef13345ef3730234c1da7b0a34cdca9b6.tar.xz
syslinux-10d05cbef13345ef3730234c1da7b0a34cdca9b6.zip
Merge remote-tracking branch 'zytor/master' into elflink
We need the recent Makefile filename changes to be merged into the elflink branch because it will make things simpler when converting all modules to ELF format. Conflicts: com32/Makefile com32/modules/Makefile version
Diffstat (limited to 'lzo')
-rw-r--r--lzo/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lzo/Makefile b/lzo/Makefile
index d88279dd..cf8f985a 100644
--- a/lzo/Makefile
+++ b/lzo/Makefile
@@ -11,7 +11,8 @@
## -----------------------------------------------------------------------
topdir = ..
-include $(topdir)/MCONFIG.build
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/build.mk
INCLUDES += -I./include