Ignore:
Timestamp:
Jun 8, 2009, 1:07:47 PM (13 years ago)
Author:
mitchb
Message:
Merge r1121:1178 from trunk to branches/fc11-dev
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev/server/fedora/Makefile

    r1147 r1179  
    2121upstream_yum    = krb5 httpd openssh php
    2222upstream        = openafs $(upstream_yum)
    23 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr nss-ldapd scripts-base
     23oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 scripts-base
    2424allsrc          = $(upstream) $(oursrc)
    2525oursrcdir       = ${PWD}/../common/oursrc
     
    127127$(oursrc): rpmbuild_args += --define 'scriptsversion $(shell svnversion ${oursrcdir}/$** | tr ':' '_')'
    128128
    129 $(filter %.i386,$(oursrc)): %.i386: setup
     129$(filter %.i586,$(oursrc)): %.i586: setup
    130130        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    131         setarch i386 rpmbuild $(rpmbuild_args) --target=i386 --define="_lib lib" -bb ${tmp_specs}/$**.spec
     131        setarch i586 rpmbuild $(rpmbuild_args) --target=i586 --define="_lib lib" -bb ${tmp_specs}/$**.spec
    132132
    133 $(filter-out %.i386,$(oursrc)): %: setup
     133$(filter-out %.i586,$(oursrc)): %: setup
    134134        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    135135        rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/$**.spec
     
    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
     182oursrc-deps     = hesinfo openldap-clients openldap-devel.i586
    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.