[Phpgroupware-cvs] CVS: packages do,1.2,1.3

[Luca - De Whiskey's - De Vitis <address@hidden>]

Update of /cvsroot/phpgroupware/packages
In directory subversions:/tmp/cvs-serv29718/packages

Modified Files:
        do 
Log Message:
- Added prerequisites checks for Solaris package builder.
- `requirements' function now uses `which' to find commands.


Index: do
===================================================================
RCS file: /cvsroot/phpgroupware/packages/do,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** do  25 Jun 2002 13:43:19 -0000      1.2
--- do  25 Jun 2002 16:06:21 -0000      1.3
***************
*** 102,106 ****
  # 
-----------------------------------------------------------------------------
  require = $(foreach command,$(subst -,_,$(1)), \
!       $(if $($(command)), \
                touch $(@) ; \
        , \
--- 102,106 ----
  # 
-----------------------------------------------------------------------------
  require = $(foreach command,$(subst -,_,$(1)), \
!       $(if $(shell which $(command)), \
                touch $(@) ; \
        , \
***************
*** 128,131 ****
--- 128,134 ----
  $(foreach format,rpm tgz slp,$(format).requirements): deb.requirements
        $(call require,alien)
+ 
+ pkg.requirements: deb.requirements
+       $(call require,pkginfo pkgtrans)
  # 
-----------------------------------------------------------------------------
  
***************
*** 276,280 ****
  # Specific variables and targets to build .pkg packages.
  # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.pkg.builded): %.pkg.builded : pkg.required %.deb.builded
        $(call compiled,pkg) > $(@)
  # 
-----------------------------------------------------------------------------
--- 279,283 ----
  # Specific variables and targets to build .pkg packages.
  # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.pkg.builded): %.pkg.builded : pkg.requirements %.deb.builded
        $(call compiled,pkg) > $(@)
  # 
-----------------------------------------------------------------------------