malekith: bootdisk Makefile.am,1.112,1.113

[Michał Moskal]

Module name:    bootdisk
Changes by:     malekith

Changed RCS file: /cvsroot/bootdisk/Makefile.am,v
----------------------------
revision 1.113
date: 2002/03/25 09:16:05;  author: malekith;  state: Exp;  lines: +5 -3
- ppc fixes
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/bootdisk/Makefile.am,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- Makefile.am	18 Mar 2002 11:41:55 -0000	1.112
+++ Makefile.am	25 Mar 2002 09:16:05 -0000	1.113
@@ -11,6 +11,8 @@
 KERNEL_VERCODE := 2
 # end of configurable parameters
 
+ARCH := $(shell uname -m | sed -e 's/i.86/ia32/; s/athlon/ia32/')
+
 SUBDIRS = batch-installer mod pkg
 
 EXTRA_DIST = scripts doc config modules-list
@@ -81,12 +83,12 @@
 
 bootdisks: bootdisk-stamp
 
-buildlog.txt: bootdisk_net.img
+buildlog.txt: bootdisk-stamp
 	cat boot*txt > buildlog.txt
 	rm boot*txt
 
 bootdisk-stamp: pkg/root-pkg.tar.gz mod/eth-mod.tar.gz mkinstaller-local
-	FTP_DIST_DIR="$(FTP_DIST_DIR)" sh mkimages
+	FTP_DIST_DIR="$(FTP_DIST_DIR)" ARCH="$(ARCH)" sh mkimages
 	touch bootdisk-stamp
 
 addons: $(ADDONS)
@@ -105,7 +107,7 @@
 
 mkinstaller-clean:
 	rm -rf floppy kernel mkinstaller-local tmp-etc 
-	rm -f config/{dev_genext2fs,mkinstaller.conf}
+	rm -f config/{dev_genext2fs,mkinstaller.conf} initrd_*
 
 pkgs-clean:
 	rm -f installer-rc