diff options
| author | obache <obache> | 2006-12-29 07:06:31 +0000 |
|---|---|---|
| committer | obache <obache> | 2006-12-29 07:06:31 +0000 |
| commit | 1b5d6c34d316942bae25236f7501dd7dfa7f4361 (patch) | |
| tree | 59bb2ed4ad6f4b30f24a96250ff54d397c0cd411 /mk/pkginstall | |
| parent | 2665a2b56ae0ded0e855227aa9e5c5e5f6067f84 (diff) | |
| download | pkgsrc-1b5d6c34d316942bae25236f7501dd7dfa7f4361.tar.gz | |
Relative $infodir is allowed, so if it's relative, add ${PREFIX}.
Diffstat (limited to 'mk/pkginstall')
| -rw-r--r-- | mk/pkginstall/info-files | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mk/pkginstall/info-files b/mk/pkginstall/info-files index 3c8cb44eed3..fec0215f359 100644 --- a/mk/pkginstall/info-files +++ b/mk/pkginstall/info-files @@ -1,4 +1,4 @@ -# $NetBSD: info-files,v 1.2 2006/07/19 22:26:26 jlam Exp $ +# $NetBSD: info-files,v 1.3 2006/12/29 07:06:31 obache Exp $ # # Generate an +INFO_FILES script that handles info file registration for # the package. @@ -70,7 +70,10 @@ ADD) ;; esac - ${TEST} -n "$infodir" || infodir="${file%/*}" + case $infodir in + "") infodir="${file%/*}" ;; + [!/]*) infodir="${PKG_PREFIX}/$infodir" ;; + esac infoindex="$infodir/dir" nentries="`${GREP} -c '^\*' $infoindex 2>/dev/null`" case "$nentries" in @@ -109,7 +112,10 @@ REMOVE) ;; esac - ${TEST} -n "$infodir" || infodir="${file%/*}" + case $infodir in + "") infodir="${file%/*}" ;; + [!/]*) infodir="${PKG_PREFIX}/$infodir" ;; + esac infoindex="$infodir/dir" ${ECHO} " $file" ${INSTALL_INFO} --info-dir="$infodir" --delete $file >/dev/null 2>&1 |