--- memtest86+-4.20.orig/Makefile	2011-01-23 20:11:04.000000000 +0200
+++ memtest86+-4.20/Makefile	2011-11-17 01:29:14.022480825 +0200
@@ -8,9 +8,7 @@
 #
 FDISK=/dev/fd0
 
-AS=as -32
-CC=gcc
-
+ASFLAGS= -32
 CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
 
 OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
@@ -25,13 +23,13 @@ all: memtest.bin memtest
 memtest_shared: $(OBJS) memtest_shared.lds Makefile
 	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
 	-o $@ $(OBJS) && \
-	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
+	$(LD) -shared -Bsymbolic -N -T memtest_shared.lds -o $@ $(OBJS)
 
 memtest_shared.bin: memtest_shared
 	objcopy -O binary $< memtest_shared.bin
 
 memtest: memtest_shared.bin memtest.lds
-	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
+	$(LD) -s -N -T memtest.lds -b binary memtest_shared.bin -o $@
 
 head.s: head.S config.h defs.h test.h
 	$(CC) -E -traditional $< -o $@
@@ -59,7 +57,7 @@ asm:
 	@./makedos.sh
 
 iso:
-	make all
+	${MAKE} all
 	./makeiso.sh
 	rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin