From 2faf83f96933b2dddbb73d7105546a2b155d020e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 2 Apr 2001 20:59:05 +0000
Subject: - "install" requires all.modules which require "mar" and
 "perl-install" - cleanup

---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index aadaf7e67..b04d96b2e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ UPLOAD_DEST = $(UPLOAD_DEST_)/cooker
 UPLOAD_DEST_CONTRIB = $(UPLOAD_DEST_)/contrib
 UPLOAD_SPARC_DEST = /mnt/BIG/distrib/sparc
 
-.PHONY: dirs $(FLOPPY_IMG) install
+.PHONY: dirs perl-install $(FLOPPY_IMG) install
 
-install: build rescue
+install: all.modules build rescue
 	for i in images misc Mandrake Mandrake/base; do install -d $(ROOTDEST)/$$i ; done
 ifneq (ppc,$(ARCH))
 	for i in $(FRELEASE_BOOT_IMG); do cp -f $${i}* $(ROOTDEST)/images; done
@@ -50,14 +50,12 @@ build: $(FBOOT_IMG)
 
 dirs:
 	@for n in . $(DIRS); do \
-		[ "$$n" = "." ] || make -C $$n all ;\
+		[ "$$n" = "." ] || $(MAKE) -C $$n all ;\
 	done
 
 rescue: all.modules
 	make -C $@
 
-network_ks.rdz pcmcia_ks.rdz: %_ks.rdz: %.rdz
-
 $(FBOOT_RDZ): dirs all.modules
 	./make_boot_img $@ `basename $(@:%.rdz=%)`
 
@@ -69,7 +67,13 @@ tar: clean
 	cd .. ; tar cfy gi.tar.bz2 gi
 	rm needed_rpms.lst
 
-all.modules:
+perl-install:
+	make -C perl-install all
+
+mdk-stage1/mar/mar:
+	make -C mdk-stage1/mar
+
+all.modules: mdk-stage1/mar/mar perl-install
 	`./tools/specific_arch ./update_kernel`
 
 $(FBOOT_IMG:%=%f): %f: %
-- 
cgit v1.2.1