aboutsummaryrefslogtreecommitdiffstats
path: root/mk
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-14 10:50:27 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-14 10:50:27 +0000
commit4c7278413ef068bd8239fd8a6c69d64bd2c0a385 (patch)
tree4c39e8872de7babc24bed9fe528df28c8d82d427 /mk
parent749297b070d1fe3d82fd9e5c4306b4aaf257f2a1 (diff)
parent348ae6af01350a9a46f3076a2facd27918f0f603 (diff)
downloadsyslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.tar.gz
syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.tar.xz
syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.zip
Merge tag 'syslinux-5.00-pre10' into for-hpa/elflink/firmware
Pull in the latest prerelease that includes some bug fixes for ldlinux and a realloc() bug in core/. Conflicts: com32/cmenu/Makefile com32/elflink/ldlinux/Makefile com32/lib/Makefile core/pxelinux.asm
Diffstat (limited to 'mk')
-rw-r--r--mk/lib.mk2
-rw-r--r--mk/syslinux.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/mk/lib.mk b/mk/lib.mk
index b37d0dcd..fc7eba11 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -75,7 +75,7 @@ LIBOTHER_OBJS = \
mempcpy.o memmem.o memmove.o memswap.o \
perror.o qsort.o seed48.o \
srand48.o sscanf.o strcasecmp.o strcat.o \
- strerror.o \
+ strerror.o errlist.o \
strnlen.o \
strncat.o strndup.o \
stpncpy.o \
diff --git a/mk/syslinux.mk b/mk/syslinux.mk
index cab80102..484afb2a 100644
--- a/mk/syslinux.mk
+++ b/mk/syslinux.mk
@@ -36,6 +36,7 @@ NASM = nasm
NASMOPT = -Ox
PERL = perl
+PYTHON = python
UPX = upx
CHMOD = chmod