Added setup-chroot script as it is from upstream.

[initrd.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a35730d8e2271e37558b0d6a77fc4de86fbbddb..c33cd5645be37806528f43dee0195a3659b6d4fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,15 @@ BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.b
 DIALOG_VERSION = 1.1-20120215
 DIALOG_SOURCE = ftp://dickey.his.com/dialog/dialog-$(DIALOG_VERSION).tgz
 
+NCURSES_HEADER = $(CLFS)/usr/include/ncurses.h
+
 .PHONY: all check-root busybox dialog initrd clean distclean
 
 all: initrd
 
 clean: busybox-clean dialog-clean initrd-clean
 
-dist-clean: busybox-distclean dialog-distclean initrd-distclean
+distclean: busybox-distclean dialog-distclean initrd-distclean
 
 check-root:
        @if [ "$$UID" != "0" ]; then \
@@ -55,7 +57,7 @@ busybox: $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/bin/busybox
 busybox-clean:
        rm -vrf $(WORK)/busybox-$(BUSYBOX_VERSION)
 
-busybox-distclean:
+busybox-distclean: busybox-clean
        rm -vf $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
 
 $(WORK)/dialog-$(DIALOG_VERSION).tgz:
@@ -77,13 +79,13 @@ $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog: $(WORK)/dialog-$(DIALO
                $(TARGET)-strip $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog && \
                touch $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog
 
-dialog: $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog
+dialog: $(NCURSES_HEADER) $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog
 
 dialog-clean:
        rm -vrf $(WORK)/dialog-$(DIALOG_VERSION)
 
-dialog-distclean:
-       rm -rf $(WORK)/dialog-$(DIALOG_VERSION).tgz
+dialog-distclean: dialog-clean
+       rm -vf $(WORK)/dialog-$(DIALOG_VERSION).tgz
 
 $(WORK)/mnt:
        mkdir -p $(WORK)/mnt
@@ -108,7 +110,7 @@ $(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $(
 initrd: $(WORK)/initrd.gz
 
 initrd-clean: check-root
-       rm -rf initrd.gz
+       rm -vf $(WORK)/initrd.gz
 
 initrd-distclean: initrd-clean