--- toast-linux	2004/04/11 07:16:30	1.11
+++ toast-linux	2004/04/11 19:56:34	1.12
@@ -109,6 +109,7 @@
 GENEXT2FS_PATCHLEVEL = 4
 MTOOLS_VERSION = 3.9.9
 SYSLINUX_VERSION = 2.08
+CDRTOOLS_VERSION = 2.00.3
 
 TOOLCHAIN_DIR = toolchain
 LINUX_DIR = linux-$(LINUX_VERSION)
@@ -121,6 +122,7 @@
 GENEXT2FS_DIR = genext2fs-$(GENEXT2FS_VERSION).orig
 MTOOLS_DIR = mtools-$(MTOOLS_VERSION)
 SYSLINUX_DIR = syslinux-$(SYSLINUX_VERSION)
+CDRTOOLS_DIR = cdrtools-$(CDRTOOLS_VERSION)
 
 TOOLCHAIN_ARCHIVE = toolchain.tar.gz
 LINUX_ARCHIVE = $(LINUX_DIR).tar.bz2
@@ -134,6 +136,7 @@
 GENEXT2FS_PATCH = genext2fs_$(GENEXT2FS_VERSION)-$(GENEXT2FS_PATCHLEVEL).diff.gz
 MTOOLS_ARCHIVE = $(MTOOLS_DIR).tar.bz2
 SYSLINUX_ARCHIVE = $(SYSLINUX_DIR).tar.bz2
+CDRTOOLS_ARCHIVE = $(CDRTOOLS_DIR).tar.bz2
 
 TOOLCHAIN_URL = http://www.uclibc.org/cgi-bin/cvsweb/toolchain.tar.gz
 LINUX_URL = http://www.kernel.org/pub/linux/kernel/v2.6/$(LINUX_ARCHIVE)
@@ -147,6 +150,9 @@
 GENEXT2FS_PATCH_URL = http://ftp.debian.org/debian/pool/main/g/genext2fs/$(GENEXT2FS_PATCH)
 MTOOLS_URL = http://mtools.linux.lu/$(MTOOLS_ARCHIVE)
 SYSLINUX_URL = http://kernel.org/pub/linux/utils/boot/syslinux/$(SYSLINUX_ARCHIVE)
+CDRTOOLS_URL = http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/cdrtools/$(CDRTOOLS_VERSION)/$(CDRTOOLS_ARCHIVE)
+# ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.00.3.tar.gz
+# http://gd.tuwien.ac.at/utils/schilling/cdrtools/cdrtools-2.00.3.tar.gz
 
 TOOLCHAIN_MAKE_DIR = $(TOOLCHAIN_DIR)/gcc-3.3.x
 TOOLCHAIN_ROOT_DIR = $(TOOLCHAIN_MAKE_DIR)/toolchain_i386/i386-linux-uclibc
@@ -168,7 +174,7 @@
 MCOPY = $(MTOOLS_DIR)/mcopy
 MDIR = $(MTOOLS_DIR)/mdir
 SYSLINUX = $(SYSLINUX_DIR)/syslinux
-MKISOFS = mkisofs
+MKISOFS = $(CDRTOOLS_DIR)/mkisofs/mkisofs
 
 PKGDIR = root/toast/pkg
 BUSYBOX_ROOTDIR = $(PKGDIR)/busybox/v$(BUSYBOX_VERSION)/1/root
@@ -202,6 +208,7 @@
 $(GENEXT2FS_PATCH): ; $(WGET) $(GENEXT2FS_PATCH_URL)
 $(MTOOLS_ARCHIVE): ; $(WGET) $(MTOOLS_URL)
 $(SYSLINUX_ARCHIVE): ; $(WGET) $(SYSLINUX_URL)
+$(CDRTOOLS_ARCHIVE): ; $(WGET) $(CDRTOOLS_URL)
 
 clean:
   rm -fr $(PKG_DIRS) symbols floppy* root*
@@ -333,8 +340,11 @@
   ./smartcat $< | tar x
   touch $@
 
-# TODO:
-$(MKISOFS):
+$(MKISOFS): $(CDRTOOLS_ARCHIVE) smartcat
+  rm -fr $(CDRTOOLS_DIR)
+  ./smartcat $< | tar x
+  $(MAKE) -C $(CDRTOOLS_DIR)/mkisofs
+  cp $(CDRTOOLS_DIR)/mkisofs/OBJ/*/mkisofs $@
 
 rootfs: root dev $(GENEXT2FS)
   rm -f $@
@@ -430,7 +440,6 @@
   - this program should be able to configure defaults for installer
   - install disk should double as a rescue disk including e2fsck
   - install disk should automatically resize FAT and NTFS partitions
-  - Makefile should build and use its own mkisofs
 
 =head1 SEE ALSO