PHP became a package. Hope this works...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1009 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/php b/config/rootfiles/packages/php
similarity index 99%
rename from config/rootfiles/common/php
rename to config/rootfiles/packages/php
index 6547d516d59c34795dbd6f343bd3a21d0c27e07b..34fd1ea7e0b54b33b4ebb04ca6ca1dc5158c1fe2 100644 (file)
--- a/config/rootfiles/common/php
+++ b/config/rootfiles/packages/php
@@ -1,3 +1,4 @@
+etc/httpd/conf/conf.d/php5.conf
 etc/pear.conf
 etc/php.ini
 #usr/bin/pear

diff --git a/lfs/applejuice b/lfs/applejuice
index 4e12c295a8e658d56f3be89ab1e617db5f429a69..0e6e8fedf8db992ee790b0e9638366f4fb19a245 100644 (file)
--- a/lfs/applejuice
+++ b/lfs/applejuice
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = applejuice
 PAK_VER    = 1
 
-DEPS       = "java"
+DEPS       = "java php"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/openmailadmin b/lfs/openmailadmin
index 147595d162bd99f581f525a4a8073c352d682790..dcf95ef5dbe870d8474cb2e2168742946a04f575 100644 (file)
--- a/lfs/openmailadmin
+++ b/lfs/openmailadmin
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = openmailadmin
 PAK_VER    = 1
 
-DEPS       = "cyrus-imapd postfix mysql"
+DEPS       = "cyrus-imapd postfix mysql php"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/php b/lfs/php
index 5661a37fbde7b8873d08fea2d846c3797e1f910e..d2c2722c98f2c191dd469fa1773bff45c9deb2bf 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -31,6 +31,11 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = php
+PAK_VER    = 1
+
+DEPS       = ""
+
 
 ###############################################################################
 # Top-level Rules