From cd109bf8f3981b050a5b7d14059ee63666604807 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sun, 31 Dec 2006 11:42:58 +0000
Subject: [PATCH] isolinux.mk: Ongoing improvements

  - Make ISO_IMAGE optional
  - Beautify clean target
  - Add MENU_32 variable for use in including Makefiles
---
 make/isolinux.mk | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/make/isolinux.mk b/make/isolinux.mk
index c98cc781..f72ab01a 100644
--- a/make/isolinux.mk
+++ b/make/isolinux.mk
@@ -7,12 +7,13 @@ DLOAD_DIR    = /home/samba/dat/share/exe/linux/syslinux
 BUILD_DIR    = cd_root
 DIRS         = $(DLOAD_DIR) $(BUILD_DIR)
 UNPACK_DIR   = isolinux
-ISO_IMAGE    = image.iso
+ISO_IMAGE   ?= image.iso
 ISOLINUX_BIN = $(UNPACK_DIR)/isolinux.bin
+MENU_32      = $(UNPACK_DIR)/com32/modules/menu.c32
 INITRD       = /boot/initrd
 
 CD_FILES = \
-	$(UNPACK_DIR)/com32/modules/menu.c32 \
+	$(MENU_32) \
 	$(ISOLINUX_BIN)
 	
 define SYSLINUX_BASE
@@ -23,15 +24,16 @@ endef
 
 all: $(ISO_IMAGE)
 install:
-clean:
-	rm -rf *.done
-	rm -rf $(BUILD_DIR) $(UNPACK_DIR)
-	rm -f $(ISO_IMAGE) $(URL_FILE) $(URL_FILE).tmp
-
+clean: syslinux.clean
 distclean: clean
 
 # == rules
 
+syslinux.clean:
+	rm -rf *.done
+	rm -rf $(BUILD_DIR) $(UNPACK_DIR)
+	rm -f $(ISO_IMAGE) $(URL_FILE) $(URL_FILE).tmp
+
 dirs.done:
 	mkdir -p $(DIRS)
 	touch $@
@@ -46,7 +48,7 @@ dload.done: $(URL_FILE)
 	wget -c $(shell cat $<) -P $(DLOAD_DIR)
 	touch $@
 
-$(UNPACK_DIR)/com32/modules/menu.c32: unpack.done
+$(MENU_32): unpack.done
 
 unpack.done: $(URL_FILE) dload.done
 	tar -xjf $(shell echo $(DLOAD_DIR)/$(SYSLINUX_BASE).tar.bz2 | sed 's/ //g')