* Fix building outside $(srcdir).

* Removed ./gen-mirrorlist.sh invocation from configure script:
  Mirror-files are generated by make, not configure.

8 files changed, 18 insertions, 27 deletions

diff --git a/autoclean.sh b/autoclean.sh
index a2708356..16364519 100755
--- a/autoclean.sh
+++ b/autoclean.sh
@@ -36,7 +36,6 @@ rm -rf etc/Makefile.in
 rm -rf etc/Makefile
 rm -rf etc/pacman.d/Makefile.in
 rm -rf etc/pacman.d/Makefile
-rm -rf etc/pacman.d/{current,extra,community,unstable,release}
 rm -rf etc/abs/Makefile.in
 rm -rf etc/abs/Makefile
 
diff --git a/configure.ac b/configure.ac
index 2856e86a..1336e3c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,10 +364,6 @@ bindings/perl/Makefile
 bindings/python/Makefile
 bindings/java/Makefile
 Makefile
-],
-[
- cd etc/pacman.d/
- ./gen-mirrorlist.sh
 ])
 
 echo "
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78f0788b..3d85e7db 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,9 +5,10 @@ SUBDIRS = hu
 po4a:
 if HAS_PO4A
 	@$(NORMAL_INSTALL)
-	po4a -k 0 po4a.cfg
+	po4a -k 0 --variable srcdir=$(srcdir) $(srcdir)/po4a.cfg 
 endif
 
+# DIST_SUBDIRS 
 if HAS_MAN2HTML
 makepkg.8:
 	man2html makepkg.8 > html/makepkg.8.html
@@ -27,7 +28,7 @@ clean:
 man_MANS = pacman.8 makepkg.8 PKGBUILD.8 libalpm.3
 
 if HAS_DOXYGEN
-man_MANS += man3/*.3
+man_MANS += *.3
 endif
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) po4a.cfg
diff --git a/doc/po4a.cfg b/doc/po4a.cfg
index 171d8275..bb977301 100644
--- a/doc/po4a.cfg
+++ b/doc/po4a.cfg
@@ -1,11 +1,11 @@
 [po4a_langs] hu
 [po4a_paths] po/pacman.pot $lang:po/$lang.po
 [type: man] pacman.8 \
-	$lang:$lang/pacman.8 add_$lang:addendum.8.$lang \
+	$lang:$lang/pacman.8 add_$(srcdir)/$lang:addendum.8.$lang \
 	opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"
 [type: man] makepkg.8 \
-	$lang:$lang/makepkg.8 add_$lang:addendum.8.$lang \
+	$lang:$lang/makepkg.8 add_$(srcdir)/$lang:addendum.8.$lang \
 	opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"
-[type: man] PKGBUILD.8 \
-	$lang:$lang/PKGBUILD.8 add_$lang:addendum.8.$lang \
+[type: man] $(srcdir)/PKGBUILD.8 \
+	$lang:$lang/PKGBUILD.8 add_$(srcdir)/$lang:addendum.8.$lang \
 	opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index 187c63f2..5fedc6ef 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,14 +1,9 @@
-EXTRA_DIST = community current extra release unstable
+pkgsysconfdir = ${sysconfdir}/pacman.d
+dist_pkgsysconf_DATA = community current extra release unstable
 
-clean:
+$(dist_pkgsysconf_DATA): mirrorlist
+	sed "s|@@REPO@@|$@|g" <$< >$@
 
-install-data-hook:
-	mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \
-	for j in $(EXTRA_DIST); do \
-	    $(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/pacman.d/$$j ; \
-	done
+clean:
+	rm $(dist_pkgsysconf_DATA)
 
-uninstall-hook:
-	for j in $(EXTRA_DIST); do \
-	    rm -f $(DESTDIR)$(sysconfdir)/pacman.d/$$j ; \
-	done
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index 688fd009..037bcff4 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -46,6 +46,6 @@ if HAS_DOXYGEN
 all: doxygen.in
 
 doxygen.in:
-	doxygen Doxyfile
+	doxygen $(srcdir)/Doxyfile
 
 endif
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 02748628..8e611327 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -16,10 +16,10 @@ pacman_SOURCES = util.c log.c package.c downloadprog.c trans.c add.c \
 
 pacman_static_SOURCES = $(pacman_SOURCES)
 
-pacman_LDADD = -L$(top_srcdir)/lib/libalpm/.libs \
+pacman_LDADD = -L$(top_builddir)/lib/libalpm/.libs \
 			   -ldownload -lalpm
 
-pacman_static_LDADD = -L$(top_srcdir)/lib/libalpm/.libs/ \
+pacman_static_LDADD = -L$(top_builddir)/lib/libalpm/.libs/ \
 					  -ldownload -lalpm
 
 pacman_static_LDFLAGS = $(LDFLAGS) -all-static
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 553c3c09..361a742f 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -4,4 +4,4 @@ AM_CFLAGS = -I$(top_srcdir)/lib/libalpm
 
 vercmp_SOURCES = vercmp.c
 
-vercmp_LDADD = $(top_srcdir)/lib/libalpm/libalpm.la
+vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm.la