From 4664a095a497de1b47d980863228860a6d19f286 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 13 Jun 2011 21:53:23 +1000 Subject: Fix man page generation for out of tree build Fix failure at man page generation when building outside the source tree. There may still be issues with other documentation types... Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- doc/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index afb8e8f2..e8f6df09 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -95,7 +95,7 @@ website: html pkgdatadir = ${datadir}/${PACKAGE} ASCIIDOC_OPTS = \ - -f asciidoc.conf \ + -f $(srcdir)/asciidoc.conf \ -a pacman_version="$(REAL_PACKAGE_VERSION)" \ -a pacman_date="`date +%Y-%m-%d`" \ -a pkgdatadir=$(pkgdatadir) \ @@ -106,11 +106,12 @@ A2X_OPTS = \ --no-xmllint \ -d manpage \ -f manpage \ - --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' + --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' \ + --destination-dir='./' # These rules are due to the includes and files of the asciidoc text $(ASCIIDOC_MANS): asciidoc.conf footer.txt - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt + a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt asciidoc $(ASCIIDOC_OPTS) $*.txt -- cgit v1.2.3-70-g09d2 From 6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 15 Jun 2011 09:10:33 -0500 Subject: list_display: fix incorrect assignment Commit 895a88886525d erroneously left this around. Noticed-by: Jakob Gruber Signed-off-by: Dan McGee --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index a6d150fc..f695ffba 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -456,7 +456,7 @@ void list_display(const char *title, const alpm_list_t *list) const char *str = alpm_list_getdata(list); printf("%s", str); cols += string_length(str); - for(i = alpm_list_next(list), cols = len; i; i = alpm_list_next(i)) { + for(i = alpm_list_next(list); i; i = alpm_list_next(i)) { const char *str = alpm_list_getdata(i); int s = string_length(str); /* wrap only if we have enough usable column space */ -- cgit v1.2.3-70-g09d2