Treat info pages like man pages

As far a package building is concerned, info pages need to be treated
in the same fashion as man pages in that they both can be compressed.
This separates them from other forms of documentation and so it makes
sense to make that distinction within makepkg.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index d127d164..d641cbb6 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -684,16 +684,16 @@ tidy_install() {
 	msg "$(gettext "Tidying install...")"
 
 	if [ "$(check_option docs)" = "n" ]; then
-		msg2 "$(gettext "Removing info/doc files...")"
+		msg2 "$(gettext "Removing doc files...")"
 		#fix flyspray bug #5021
 		rm -rf ${DOC_DIRS[@]}
 	fi
 
 	if [ "$(check_option zipman)" = "y" ]; then
-		msg2 "$(gettext "Compressing man pages...")"
+		msg2 "$(gettext "Compressing man and info pages...")"
 		local manpage mandirs ext file link hardlinks hl
-		mandirs="usr/man usr/share/man usr/local/man usr/local/share/man opt/*/man"
-		find ${mandirs} -type f 2>/dev/null |
+		mandirs=({usr{,/local}{,/share},opt/*}/{man,info})
+		find ${mandirs[@]} -type f 2>/dev/null |
 		while read manpage ; do
 			# check file still exists (potentially compressed with hard link)
 			if [ -f ${manpage} ]; then
@@ -701,7 +701,7 @@ tidy_install() {
 				file="${manpage##*/}"
 				if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then
 					# update symlinks to this manpage
-					find ${mandirs} -lname "$file" 2>/dev/null |
+					find ${mandirs[@]} -lname "$file" 2>/dev/null |
 					while read link ; do
 						rm -f "$link"
 						ln -sf "${file}.gz" "${link}.gz"
@@ -709,7 +709,7 @@ tidy_install() {
 					# find hard links and remove them
 					#   the '|| true' part keeps the script from bailing if find returned an
 					#   error, such as when one of the man directories doesn't exist
-					hardlinks="$(find ${mandirs} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true
+					hardlinks="$(find ${mandirs[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true
 					for hl in ${hardlinks}; do
 						rm -f "${hl}";
 					done