Changeset 1883

Timestamp:

Jun 8, 2011, 2:53:27 AM (14 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:

• branches/fc15-dev/server/fedora/Makefile (modified) (2 diffs)

branches/fc15-dev/server/fedora/Makefile

@@ -22 +22 @@
 hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
-upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr
+upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr athena-aclocal discuss
 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
 allsrc          = $(upstream) $(oursrc)
@@ -79 +79 @@
         touch download_stamp
 
+        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
+        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
+        cp $(oursrcdir)/discuss/* $(tmp_src)
 %.src.rpm:
         wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm