added generation of x86 livecds, from #2391

[openwrt.git] / include / prereq.mk

diff --git a/include/prereq.mk b/include/prereq.mk
index f0db860..4a55c89 100644 (file)
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -1,10 +1,13 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 

+ifneq ($(__prereq_inc),1)
+__prereq_inc:=1
+

 prereq:
        if [ -f $(TMP_DIR)/.prereq-error ]; then \
                echo; \
 prereq:
        if [ -f $(TMP_DIR)/.prereq-error ]; then \
                echo; \


@@ -15,6 +18,7 @@ prereq:
        fi
 
 .SILENT: prereq
        fi
 
 .SILENT: prereq

+endif

 
 define Require
   export PREREQ_CHECK=1
 
 define Require
   export PREREQ_CHECK=1


@@ -27,7 +31,7 @@ define Require
                        echo 'ok.'; \
                else \
                        echo 'failed.'; \
                        echo 'ok.'; \
                else \
                        echo 'failed.'; \

-                       echo -e "$(strip $(2))" >> $(TMP_DIR)/.prereq-error; \
+                       echo -e "$(PKG_NAME): $(strip $(2))" | perl -ne 's/\\\s*/\n/g,print' >> $(TMP_DIR)/.prereq-error; \

                fi
 
     check-$(1): FORCE
                fi
 
     check-$(1): FORCE


@@ -47,3 +51,12 @@ define RequireCommand
   $$(eval $$(call Require,$(1),$(2)))
 endef
 
   $$(eval $$(call Require,$(1),$(2)))
 endef
 

+define RequireHeader
+  define Require/$(1)
+    [ -e "$(1)" ]
+  endef
+  
+  $$(eval $$(call Require,$(1),$(2)))
+endef
+
+.NOTPARALLEL: