Ignore:
Timestamp:
Jul 3, 2009, 3:47:04 AM (15 years ago)
Author:
mitchb
Message:
Merge r1225:1237 from trunk to branches/fc11-dev
Location:
branches/fc11-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev

  • branches/fc11-dev/server/fedora/Makefile

    r1220 r1238  
    2121upstream_yum    = krb5 httpd openssh php
    2222upstream        = openafs $(upstream_yum)
    23 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun scripts-base
     23oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun php_scripts scripts-base
    2424allsrc          = $(upstream) $(oursrc)
    2525oursrcdir       = ${PWD}/../common/oursrc
     
    180180# The following packages are needed for our packages
    181181basic-deps      = kernel-devel rpm-build rpmdevtools gcc autoconf patch krb5-workstation glibc-devel.i586 glibc-devel libtool libgcc.i586
    182 oursrc-deps     = hesinfo openldap-clients openldap-devel.i586
     182oursrc-deps     = hesinfo openldap-clients openldap-devel.i586 php-devel
    183183httpdmods-deps  = httpd-devel
    184184httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
Note: See TracChangeset for help on using the changeset viewer.