Index: trunk/fink/main/finkinfo/macathena-moira.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-moira.info (revision 47)
+++ trunk/fink/main/finkinfo/macathena-moira.info (revision 50)
@@ -14,5 +14,6 @@
 Source-MD5: c4ee8b7555546e9b2b70eb31e3307a7e
 
-BuildDepends: fink (>= 0.24.12), macathena-hesiod, libncurses5
+Depends: macathena-hesiod, libncurses5
+BuildDepends: fink (>= 0.24.12)
 UpdateConfigGuess: true
 PatchFile: %n.patch
Index: trunk/fink/main/finkinfo/macathena-athinfo.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-athinfo.info (revision 49)
+++ trunk/fink/main/finkinfo/macathena-athinfo.info (revision 50)
@@ -16,9 +16,9 @@
 Source-MD5: 2e4951883d4892df0c393db54fddbff3
 
-BuildDepends: automake-1.9
+BuildDepends: automake1.9
 UpdateConfigGuess: true
 CompileScript: <<
-	cp %p/share/automake-1.9/install-sh %b/
-	cp %p/share/automake-1.9/mkinstalldirs %b/
+	cp %p/share/automake1.9/install-sh %b/
+	cp %p/share/automake1.9/mkinstalldirs %b/
 	autoconf
 	./configure %c
Index: trunk/fink/main/finkinfo/macathena-base.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-base.info (revision 47)
+++ trunk/fink/main/finkinfo/macathena-base.info (revision 50)
@@ -12,5 +12,5 @@
 <<
 
-Depends: automake-1.9
+BuildDepends: automake1.9
 CompileScript: <<
 <<
Index: trunk/fink/main/finkinfo/macathena-machtype.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-machtype.info (revision 49)
+++ trunk/fink/main/finkinfo/macathena-machtype.info (revision 50)
@@ -9,5 +9,6 @@
 Source-MD5: d1d9a6c6a0f379216e23b588bd99ef0d
 
-BuildDepends: fink (>= 0.24.12), macathena-base, automake-1.9
+Depends: macathena-base
+BuildDepends: fink (>= 0.24.12), automake1.9
 UpdateConfigGuess: true
 PatchFile: %n.patch
@@ -15,6 +16,6 @@
 PatchScript: patch -p0 < %{PatchFile}
 CompileScript: <<
-	cp %p/share/automake-1.9/install-sh %b/
-	cp %p/share/automake-1.9/mkinstalldirs %b/
+	cp %p/share/automake1.9/install-sh %b/
+	cp %p/share/automake1.9/mkinstalldirs %b/
 	autoconf
 	env `python2.5 %b/getSysnameList.py` ATHENA_MAJOR_VERSION=9 ATHENA_MINOR_VERSION=4 ./configure %c
Index: trunk/fink/main/finkinfo/macathena-athdir.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-athdir.info (revision 49)
+++ trunk/fink/main/finkinfo/macathena-athdir.info (revision 50)
@@ -12,9 +12,10 @@
 Source-MD5: 4d7fbfe6aba366c75c0e082e586abaa1
 
-BuildDepends: macathena-libathdir, automake-1.9
+Depends: macathena-libathdir
+BuildDepends: automake1.9
 UpdateConfigGuess: true
 CompileScript: <<
-	cp %p/share/automake-1.9/install-sh %b/
-	cp %p/share/automake-1.9/mkinstalldirs %b/
+	cp %p/share/automake1.9/install-sh %b/
+	cp %p/share/automake1.9/mkinstalldirs %b/
 	autoconf
 	./configure %c
Index: trunk/fink/main/finkinfo/macathena-libathdir.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-libathdir.info (revision 49)
+++ trunk/fink/main/finkinfo/macathena-libathdir.info (revision 50)
@@ -12,9 +12,9 @@
 Source-MD5: f032b6df8041182e4b673579542237f6
 
-BuildDepends: automake-1.9
+BuildDepends: automake1.9
 UpdateConfigGuess: true
 CompileScript: <<
-	cp %p/share/automake-1.9/install-sh %b/
-	cp %p/share/automake-1.9/mkinstalldirs %b/
+	cp %p/share/automake1.9/install-sh %b/
+	cp %p/share/automake1.9/mkinstalldirs %b/
 	autoconf
 	./configure %c