aboutsummaryrefslogtreecommitdiffstats
path: root/MCONFIG
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-20 15:15:34 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-08-20 15:15:34 -0700
commitbd09a6d828fa492aed4406adde6c412e0e5c640d (patch)
tree660a4813999ba273afb26fd3e137399cb0a57a97 /MCONFIG
parent6aa3a1c8380276387430684eb39650e958b0030a (diff)
downloadsyslinux.git-bd09a6d828fa492aed4406adde6c412e0e5c640d.tar.gz
syslinux.git-bd09a6d828fa492aed4406adde6c412e0e5c640d.tar.xz
syslinux.git-bd09a6d828fa492aed4406adde6c412e0e5c640d.zip
Major Makefile cleanups; gcc 4.3.0 compatiblity
Cleanup and centralize the Makefile system even more. Fix a gcc 4.3 incompatibility in memdisk (definition of strlen).
Diffstat (limited to 'MCONFIG')
-rw-r--r--MCONFIG6
1 files changed, 4 insertions, 2 deletions
diff --git a/MCONFIG b/MCONFIG
index 09764c8c..6919ce76 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -26,6 +26,7 @@ AUXDIR = $(DATADIR)/syslinux
MANDIR = /usr/man
INCDIR = /usr/include
TFTPBOOT = /tftpboot
+COM32DIR = $(AUXDIR)/com32
BOOTDIR = /boot
EXTLINUXDIR = $(BOOTDIR)/extlinux
@@ -36,8 +37,7 @@ NASMOPT = -O9999
PERL = perl
CC = gcc
-TMPFILE := $(shell mktemp /tmp/gcc_ok.XXXXXX)
-gcc_ok = $(shell tmpf=$(TMPFILE); \
+gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \
if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \
then echo '$(1)'; else echo '$(2)'; fi; \
rm -f $$tmpf)
@@ -48,3 +48,5 @@ OBJCOPY = objcopy
AR = ar
NM = nm
RANLIB = ranlib
+GZIPPROG = gzip
+PNGTOPNM = pngtopnm