summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-15 09:16:08 -0500
committerDan McGee <dan@archlinux.org>2011-06-15 09:16:08 -0500
commit5f404f2cb78f48ddd90be0334fa2528961b17871 (patch)
treeda1f688fb432828547874e51160fddc288f2cd57
parente92083798cdd98961e0d2befe25af7a8f96c9ab5 (diff)
parent6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 (diff)
Merge branch 'maint'
-rw-r--r--doc/Makefile.am7
-rw-r--r--src/pacman/util.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bc0244c2..4fb57803 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -101,7 +101,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) \
@@ -112,11 +112,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
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 2a7b3773..5d666e21 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -583,7 +583,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 */