From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sat, 27 Oct 2007 13:29:18 +0000 (+0000)
Subject: PHP became a package. Hope this works...
X-Git-Tag: v2.3-beta1~290
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e245b293f5e49e3dcb898d19945bf24a67824afb

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 6547d516d5..34fd1ea7e0 100644
--- 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 4e12c295a8..0e6e8fedf8 100644
--- 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 147595d162..dcf95ef5db 100644
--- 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 5661a37fbd..d2c2722c98 100644
--- 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