diff -upk.orig lilo-22.7.3.orig/Makefile lilo-22.7.3/Makefile
--- lilo-22.7.3.orig/Makefile	2006-08-12 03:20:08 +0000
+++ lilo-22.7.3/Makefile	2006-12-29 13:54:17 +0000
@@ -77,7 +77,7 @@ DOS_DIR=/dosC/boot
 #  manpath | sed "s/:.*//"; else echo /usr/man; fi`
 #
 MAN_DIR=`if [ -f /usr/bin/manpath ]; then \
-	manpath | sed "s/:.*//"; else echo /usr/man; fi`
+	manpath | sed "s/:.*//"; else echo /usr/share/man; fi`
 
 # set the compiler optimization level
 
@@ -113,7 +113,7 @@ LD86=ld86 -0
 NASM=nasm
 G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
 
-CFLAGS=$(OPT) -Wall -g $(PCONFIG)
+CFLAGS=$(OPT) $(PCONFIG)
 LDFLAGS=#-Xlinker -qmagic
 LIBS=$(DEVMAPPER)
 
@@ -162,10 +162,11 @@ help:
 #
 # everything needed to run, just short of installation
 #
-all:	lilo bootsect.b diag1.img # OBSOLETE:  $(BOOTS) edit dparam.com activate
+all:	lilo bootsect.b
+extras: diag1.img # OBSOLETE:  $(BOOTS) edit dparam.com activate
 	if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \
-		make diagnostic; \
-		make dosexe; fi
+		$(MAKE) diagnostic; \
+		$(MAKE) dosexe; fi
 
 #
 # everything above plus the statically linked version
@@ -176,7 +177,7 @@ alles: all lilo.static
 # documentation files
 #
 docs:
-	make -C doc all
+	$(MAKE) -C doc all
 
 #
 # if you have the 'bcc' compiler, then you can make the diagnostics, too
@@ -199,13 +200,13 @@ floppy:
 	@echo before you proceed from this point.
 	@echo "Press <Enter> to continue, <^C> to abort ..."
 	@read
-	@make floppy1
+	@$(MAKE) floppy1
 	@echo Done.
 	@echo
 	@echo Remove the floppy from the drive.  Label it "\"1.6\""
 	@echo "Press <Enter> to continue, <^C> to abort ..."
 	@read
-	@make floppy2
+	@$(MAKE) floppy2
 	@echo Done.
 	@echo
 	@echo Remove the floppy from the drive.  Label it "\"2.4\""
@@ -223,7 +224,7 @@ floppy1:	test.img disk.com bootsect.b
 floppy2:	test.img disk.b
 	@echo
 	@echo Creating Diagnostic Floppy 2.4
-	@make -C diagnose check; make -C diagnose floppy
+	@$(MAKE) -C diagnose check; $(MAKE) -C diagnose floppy
 
 diagnostic:	test.img diag2.img diag3.img
 dosexe:		test.img lilo.com
@@ -251,10 +252,10 @@ manpath:
 		dd if=$*.img of=$*.b bs=32 skip=1
 
 activate:	activate.c
-		$(CC) -Wall -s -O -o activate activate.c $(LDFLAGS)
+		$(CC) $(CFLAGS) -o activate activate.c $(LDFLAGS)
 
 edit:		$(EDIT)
-		$(CC) -Wall -s -O -DSTANDALONE -o edit $(EDIT) $(LDFLAGS)
+		$(CC) $(CFLAGS) -DSTANDALONE -o edit $(EDIT) $(LDFLAGS)
 
 loader.i:	mkloader first.b second.b third.b bitmap.b mbr.b \
 			chain.b os2_d.b mbr2.b
@@ -318,10 +319,10 @@ pseudo1.b:	pseudo1.s
 pseudo3.b:	pseudo3.s
 
 diagnose/test4.com: 	diagnose/test4.c
-	make -C diagnose all
+	$(MAKE) -C diagnose all
 
 diagnose/test5.com:	diagnose/test5.c
-	make -C diagnose all
+	$(MAKE) -C diagnose all
 
 diag1.img:	disk.com pseudo1.b
 	cat pseudo1.b disk.com >diag1.img
@@ -333,7 +334,7 @@ diag3.img:	diagnose/test5.com pseudo3.b
 	cat pseudo3.b diagnose/test5.com >diag3.img
 
 dos/lilo.com:
-	make -C dos -e CFLAGS="$(PCONFIG)" lilo.com
+	$(MAKE) -C dos -e CFLAGS="$(PCONFIG)" lilo.com
 
 lilo.com:	dos/lilo.com
 	cp -uf $< $@
@@ -484,23 +485,23 @@ mkloader:	temp.c
 tidy:
 		rm -f core $(LIS) *.shs *.crc $(TMP)*
 		rm -rf sbin boot usr
-		make -C diagnose tidy
-		make -C dos tidy
-		make -C doc tidy
+		$(MAKE) -C diagnose tidy
+		$(MAKE) -C dos tidy
+		$(MAKE) -C doc tidy
 		if [ -x lilo ]; then strip lilo; fi
 		if [ -x lilo.static ]; then strip lilo.static; fi
 
 clean:		tidy
 		rm -f *.o *.s *.i *.img *.b tmp_make version
 		rm -f lilo lilo.static activate edit mkloader
-		make -C diagnose clean
-		make -C dos clean
+		$(MAKE) -C diagnose clean
+		$(MAKE) -C dos clean
 
 spotless:	clean
 		rm -f *~ */*~ *.b *.com lilo*tar.gz
-		make -C diagnose spotless
-		make -C dos spotless
-		make -C doc clean
+		$(MAKE) -C diagnose spotless
+		$(MAKE) -C dos spotless
+		$(MAKE) -C doc clean
 
 ### Dependencies
 activate.o: activate.c