[csw-devel] SF.net SVN: gar:[10409] csw/mgar/gar/v2/gar.mk

[bdwalton at users.sourceforge.net]

Revision: 10409
          http://gar.svn.sourceforge.net/gar/?rev=10409&view=rev
Author:   bdwalton
Date:     2010-07-03 15:57:24 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
gar/v2: enable use of external script for pre-req dep checks

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-07-02 21:45:38 UTC (rev 10408)
+++ csw/mgar/gar/v2/gar.mk	2010-07-03 15:57:24 UTC (rev 10409)
@@ -294,13 +294,17 @@
 	@echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS) $(DEP_PKGS) $(foreach S,$(_PKG_SPECS),$(DEP_PKGS_$S))) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+ALL_PREREQ_PKGS = $(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS) $(DEP_PKGS) $(foreach S,$(_PKG_SPECS),$(DEP_PKGS_$S))
+PREREQUISITE_TARGETS =  $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 # Force to be called in global modulation
-prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite)
+prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite check-prereqs $(PREREQUISITE_TARGETS) post-prerequisite)
 	$(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite)
 	$(DONADA)
 
+check-prereqs:
+	@$(abspath $(GARBIN)/check_for_deps) $(ALL_PREREQ_PKGS)
+
 prerequisitepkg-%:
 	@echo " ==> Verifying for installed package $*: \c"
 	@(pkginfo -q $*; if [ $$? -eq 0 ]; then echo "installed"; else echo "MISSING"; exit 1; fi)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.