summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-10-15 20:46:33 +0000
committerAaron Griffin <aaron@archlinux.org>2006-10-15 20:46:33 +0000
commite037328e219697f8453dc25df2b8f0d25bbc1acc (patch)
treec0eadf6a99f2a141f221ae23d488c256165d6dda
parent91f450050335b747da2f4cd75260df7f9b36741c (diff)
Corrected documentation compilation - succeeds now
-rw-r--r--Makefile.am3
-rwxr-xr-xautoclean.sh2
-rw-r--r--configure.ac4
-rw-r--r--src/pacman/sync.c9
4 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index ebec81b1..d91b8bd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS = lib/libftp lib/libalpm src/util src/pacman scripts doc etc
+SUBDIRS = lib/libftp lib/libalpm src/util src/pacman scripts doc doc/hu etc
+
if HAS_PERL
SUBDIRS += bindings/perl
endif
diff --git a/autoclean.sh b/autoclean.sh
index cc90da68..003e43b1 100755
--- a/autoclean.sh
+++ b/autoclean.sh
@@ -22,6 +22,8 @@ rm -rf aclocal.m4
rm -rf ltmain.sh
rm -rf doc/Makefile
rm -rf doc/Makefile.in
+rm -rf doc/hu/Makefile
+rm -rf doc/hu/Makefile.in
rm -rf doc/html/*
rm -rf doc/man3/*
rm -rf compile
diff --git a/configure.ac b/configure.ac
index 0976ad0a..46fcf86d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,7 @@ dnl Define here the libalpm version number
PM_MAJOR_VERSION=0
PM_MINOR_VERSION=1
PM_MICRO_VERSION=0
-PM_MICRO_VERSION_SUFFIX=.0
-PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION$PM_MICRO_VERSION_SUFFIX
+PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION
dnl Needed for libtool to create proper shared lib version
PM_VERSION_INFO=`expr $PM_MAJOR_VERSION + $PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION
@@ -375,6 +374,7 @@ src/pacman/po/Makefile.in
src/util/Makefile
scripts/Makefile
doc/Makefile
+doc/hu/Makefile
etc/Makefile
etc/pacman.d/Makefile
bindings/perl/Makefile
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index d06ed278..e77c9eab 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -197,10 +197,11 @@ static int sync_search(list_t *syncs, list_t *targets)
PM_PKG *pkg = alpm_list_getdata(lp);
char *group = (char *)alpm_list_getdata(alpm_pkg_getinfo(pkg,PM_PKG_GROUPS));
- printf("%s/%s%s%s %s\n ", (char *)alpm_db_getinfo(sync->db, PM_DB_TREENAME),
- (char *)alpm_pkg_getinfo(pkg, PM_PKG_NAME),
- (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION));
- (group ? " (" : ""), (group ? group : ""), (group ? ") " : ""),
+ printf("%s/%s %s %s%s%s\n ",
+ (char *)alpm_db_getinfo(sync->db, PM_DB_TREENAME),
+ (char *)alpm_pkg_getinfo(pkg, PM_PKG_NAME),
+ (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION),
+ (group ? " (" : ""), (group ? group : ""), (group ? ") " : ""));
indentprint((char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), 4);
printf("\n");
}