moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Allan McRae 2008-08-13 03:00:18 +10:00 committed by Dan McGee
parent 3ff7701e89
commit 7865fb9af4
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/PKGBUILD.5.txt
View File

@ -181,8 +181,8 @@ similar to `$_basekernver`.
disable this option. disable this option.
*docs*;; *docs*;;
Save doc and info directories. If you wish to delete doc and Save doc directories. If you wish to delete doc directories,
info directories, specify `!docs` in the array. specify `!docs` in the array.
*libtool*;; *libtool*;;
Leave libtool (.la) files in packages. Specify `!libtool` to Leave libtool (.la) files in packages. Specify `!libtool` to
@ -192,7 +192,7 @@ similar to `$_basekernver`.
Leave empty directories in packages. Leave empty directories in packages.
*zipman*;; *zipman*;;
Compress man pages with gzip. Compress man and info pages with gzip.
*ccache*;; *ccache*;;
Allow the use of ccache during build. More useful in its negative Allow the use of ccache during build. More useful in its negative

6
doc/makepkg.conf.5.txt
View File

@ -110,8 +110,8 @@ Options
option. option.
*docs*;; *docs*;;
Save doc and info directories. If you wish to delete doc and info Save doc directories. If you wish to delete doc directories, specify
directories, specify `!docs' in the array. `!docs' in the array.
*libtool*;; *libtool*;;
Leave libtool (.la) files in packages. Specify `!libtool' to remove Leave libtool (.la) files in packages. Specify `!libtool' to remove
@ -121,7 +121,7 @@ Options
Leave empty directories in packages. Leave empty directories in packages.
*zipman*;; *zipman*;;
Compress man pages with gzip. Compress man and info pages with gzip.
**INTEGRITY_CHECK=(**check1 ...**)**:: **INTEGRITY_CHECK=(**check1 ...**)**::
File integrity checks to use. Multiple checks may be specified; this File integrity checks to use. Multiple checks may be specified; this

2
etc/makepkg.conf.in
View File

@ -72,7 +72,7 @@ OPTIONS=(strip docs libtool emptydirs zipman)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5) INTEGRITY_CHECK=(md5)
#-- Info and doc directories to remove (if option set correctly above) #-- Info and doc directories to remove (if option set correctly above)
DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
#-- Directories to be searched for the strip option (if option set correctly above) #-- Directories to be searched for the strip option (if option set correctly above)
STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})

12
scripts/makepkg.sh.in
View File

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