diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh index 6749b7a9b34..3ace80fedcf 100644 --- a/common/hooks/do-pkg/00-gen-pkg.sh +++ b/common/hooks/do-pkg/00-gen-pkg.sh @@ -1,5 +1,18 @@ # This hook generates a XBPS binary package from an installed package in destdir. +expand_dstdir() { + local glob_list= result= glob= file= + + for glob; do + glob_list+=" $DESTDIR/$glob" + done + shopt -s extglob + for file in $glob_list; do + result+=" ${file#$DESTDIR/}" + done + shopt -u extglob +} + genpkg() { local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5" local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts @@ -50,7 +63,7 @@ genpkg() { local _replaces="$(echo $replaces)" local _reverts="$(echo $reverts)" local _mutable_files="$(echo $mutable_files)" - local _conf_files="$(echo $conf_files)" + local _conf_files="$(expand_dstdir $conf_files)" local _alternatives="$(echo $alternatives)" local _tags="$(echo $tags)"