Changeset 1883 for branches/fc15-dev


Ignore:
Timestamp:
Jun 8, 2011, 2:53:27 AM (11 years ago)
Author:
achernya
Message:
Fix Makefile to be aware of athena-aclocal and discuss.

In the earlier large merge from trunk, Makefile was incorrectly
left as "mine-full" instead of a proper conflicts resolution. This 
version of Makefile correctly includes the changes that were missed.
File:
1 edited

Legend:

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

    r1826 r1883  
    2222hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
    2323upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
    24 upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr
     24upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr athena-aclocal discuss
    2525oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
    2626allsrc          = $(upstream) $(oursrc)
     
    7979        touch download_stamp
    8080
     81        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
     82        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
     83        cp $(oursrcdir)/discuss/* $(tmp_src)
    8184%.src.rpm:
    8285        wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
Note: See TracChangeset for help on using the changeset viewer.