summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-02 20:59:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-02 20:59:05 +0000
commit2faf83f96933b2dddbb73d7105546a2b155d020e (patch)
treefa9f3e2393bde0e2871e426def4b24a718ec575b
parentea19b9317c884c88d0028bac59809b72e56a7426 (diff)
downloaddrakx-backup-do-not-use-2faf83f96933b2dddbb73d7105546a2b155d020e.tar
drakx-backup-do-not-use-2faf83f96933b2dddbb73d7105546a2b155d020e.tar.gz
drakx-backup-do-not-use-2faf83f96933b2dddbb73d7105546a2b155d020e.tar.bz2
drakx-backup-do-not-use-2faf83f96933b2dddbb73d7105546a2b155d020e.tar.xz
drakx-backup-do-not-use-2faf83f96933b2dddbb73d7105546a2b155d020e.zip
- "install" requires all.modules which require "mar" and "perl-install"
- cleanup
-rw-r--r--Makefile16
1 files changed, 10 insertions, 6 deletions
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: %