Finish making autoconf changes

Fix up everything in the etc/ directory so it is built at make-time and
not configure-time. This reduces configure generated files to just the
makefiles, which is the correct way to do things. This also allows a switch
from @@REPO@@ to the more sane @REPO@ in mirrorlist.in, and kills the
two-part generation of the mirror files.

Signed-off-by: Dan McGee <dan@archlinux.org>

4 files changed, 80 insertions, 47 deletions

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 0bded95e..2bd7cc12 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,25 @@
 SUBDIRS = pacman.d abs
 
-EXTRA_DIST = makepkg.conf pacman.conf
 dist_sysconf_DATA = makepkg.conf pacman.conf
+EXTRA_DIST = makepkg.conf.in pacman.conf.in
+
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(dist_sysconf_DATA)
+
+#### Taken from the autoconf scripts Makefile.am ####
+edit = sed \
+	-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
+	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
+	-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
+	-e 's|@CARCH[@]|$(CARCH)|g' \
+	-e 's|@CHOST[@]|$(CHOST)|g' \
+	-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
+	-e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g'
+
+$(dist_sysconf_DATA): Makefile
+	rm -f $@ $@.tmp
+	$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+	mv $@.tmp $@
+
+makepkg.conf: $(srcdir)/makepkg.conf.in
+pacman.conf: $(srcdir)/pacman.conf.in
diff --git a/etc/pacman.d/.gitignore b/etc/pacman.d/.gitignore
index 32b2d700..c7001838 100644
--- a/etc/pacman.d/.gitignore
+++ b/etc/pacman.d/.gitignore
@@ -3,7 +3,6 @@ Makefile.in
 community
 current
 extra
-mirrorlist
 release
 unstable
 testing
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index c8dded4b..f6f9051a 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,9 +1,22 @@
 pkgsysconfdir = ${sysconfdir}/pacman.d
 dist_pkgsysconf_DATA = community current extra release testing unstable
+EXTRA_DIST = mirrorlist.in
+#
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA)
 
-$(dist_pkgsysconf_DATA): mirrorlist
-	sed "s|@@REPO@@|$@|g" <$< >$@
+$(dist_pkgsysconf_DATA): Makefile
+	rm -f $@ $@.tmp
+	sed \
+		-e "s|@REPO[@]|$@|g" \
+		-e 's|@CARCH[@]|$(CARCH)|g' \
+		$(srcdir)/mirrorlist.in >$@.tmp
+	mv $@.tmp $@
 
-clean-local:
-	rm -f $(dist_pkgsysconf_DATA)
 
+community: $(srcdir)/mirrorlist.in
+current: $(srcdir)/mirrorlist.in
+extra: $(srcdir)/mirrorlist.in
+release: $(srcdir)/mirrorlist.in
+testing: $(srcdir)/mirrorlist.in
+unstable: $(srcdir)/mirrorlist.in
diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in
index 53fefa67..4bd65364 100644
--- a/etc/pacman.d/mirrorlist.in
+++ b/etc/pacman.d/mirrorlist.in
@@ -1,72 +1,72 @@
 #
-# @@REPO@@: Arch Linux @@REPO@@ repository
+# @REPO@: Arch Linux @REPO@ repository
 #
 
 # United States
-Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
-Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.archlinux.org/@REPO@/os/@CARCH@
+Server = ftp://ftp.nethat.com/pub/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@REPO@/os/@CARCH@
+Server = http://mirrors.easynews.com/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@REPO@/os/@CARCH@
 
 # Europe
 # - Austria
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@REPO@/os/@CARCH@
 # - Belgium
-Server = ftp://ftp.belnet.be/packages/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.belnet.be/packages/archlinux/@REPO@/os/@CARCH@
 # - Czech Republic
-Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@REPO@/os/@CARCH@
 # - Estonia
-Server = ftp://ftp.estpak.ee/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.estpak.ee/pub/archlinux/@REPO@/os/@CARCH@
 # - Finland
-Server = ftp://ftp.sixnix.net/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.sixnix.net/pub/archlinux/@REPO@/os/@CARCH@
 # - France
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mir1.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mir2.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mir1.archlinuxfr.org/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mir2.archlinuxfr.org/archlinux/@REPO@/os/@CARCH@
+Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@REPO@/os/@CARCH@
 # - Germany
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@REPO@/os/@CARCH@
+Server = ftp://ftp.archlinuxppc.org/i686/@REPO@/os/@CARCH@
 # - Great Britain
-Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@REPO@/os/@CARCH@
 # - Greece
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.ntua.gr/pub/linux/archlinux/@REPO@/os/@CARCH@
 # - Ireland
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/@REPO@/os/@CARCH@
 # - Italy
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mi.mirror.garr.it/mirrors/archlinux/@REPO@/os/@CARCH@
 # - Lithuania
-Server = ftp://saule.mintis.lt/pub/linux/@@REPO@@/os/@CARCH@
+Server = ftp://saule.mintis.lt/pub/linux/@REPO@/os/@CARCH@
 # - Netherlands
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/@REPO@/os/@CARCH@
 # - Norway
-Server = ftp://mirror.djzradio.net/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mirror.djzradio.net/archlinux/@REPO@/os/@CARCH@
 # - Poland
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mirror.icis.pcz.pl/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mirror.icis.pcz.pl/archlinux/@REPO@/os/@CARCH@
 # - Portugal
-Server = ftp://gul.est.ips.pt/repos/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://cesium.di.uminho.pt/pub/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://gul.est.ips.pt/repos/archlinux/@REPO@/os/@CARCH@
+Server = ftp://cesium.di.uminho.pt/pub/archlinux/@REPO@/os/@CARCH@
+Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@REPO@/os/@CARCH@
 # - Romania
-Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@REPO@/os/@CARCH@
 # - Russia
-Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@
+Server = http://archlinux.freeside.ru/@REPO@/os/@CARCH@
 # - Sweden
-Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.gigabit.nu/@REPO@/os/@CARCH@
 # - Switzerland
-Server = ftp://archlinux.puzzle.ch/@@REPO@@/os/@CARCH@
+Server = ftp://archlinux.puzzle.ch/@REPO@/os/@CARCH@
 # - Turkey
-Server = ftp://ftp.linux.org.tr/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.linux.org.tr/pub/archlinux/@REPO@/os/@CARCH@
 # - Ukraine
-Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@REPO@/os/@CARCH@
 
 # Australia
-Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mirror.pacific.net.au/linux/archlinux/@REPO@/os/@CARCH@