Use only one mirror list for all repos

Fully implement what this commit allows:
ebad1996149d72cf4a1fe15fe8326f2b4996f585

Dan: update .gitignore as well.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 2 insertions, 8 deletions

diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index 940282dc..e1f33c76 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,5 +1,5 @@
 pkgsysconfdir = ${sysconfdir}/pacman.d
-dist_pkgsysconf_DATA = community current extra release testing unstable
+dist_pkgsysconf_DATA = mirrorlist
 EXTRA_DIST = mirrorlist.in
 #
 # Files that should be removed, but which Automake does not know.
@@ -8,16 +8,10 @@ MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA)
 $(dist_pkgsysconf_DATA): Makefile
 	rm -f $@ $@.tmp
 	sed \
-		-e "s|@REPO[@]|$@|g" \
 		-e 's|@CARCH[@]|$(CARCH)|g' \
 		$(srcdir)/mirrorlist.in >$@.tmp
 	mv $@.tmp $@
 
-community: $(srcdir)/mirrorlist.in
-current: $(srcdir)/mirrorlist.in
-extra: $(srcdir)/mirrorlist.in
-release: $(srcdir)/mirrorlist.in
-testing: $(srcdir)/mirrorlist.in
-unstable: $(srcdir)/mirrorlist.in
+mirrorlist: $(srcdir)/mirrorlist.in
 
 # vim:set ts=2 sw=2 noet: