--- /usr/bin/makepkg 2011-10-22 22:58:44.218700734 -0700 +++ /home/shadowkyogre/bin/makepkg 2011-10-22 23:11:14.602071172 -0700 @@ -409,8 +409,8 @@ local ret=0 local pmout pmout=$(run_pacman -T "$@") || ret=$? - set -E - + set -E + if (( ret == 127 )); then #unresolved deps echo "$pmout" elif (( ret )); then @@ -1128,6 +1128,9 @@ if [[ -f $file ]]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "${startdir}/$file" "$srclinks/$pkgbase" + elif [[ -f "${SRCDEST}/$file" ]]; then + msg2 "$(gettext "Adding %s...")" "$file" + ln -s "${SRCDEST}/$file" "$srclinks/$pkgbase" elif (( SOURCEONLY == 2 )); then local absfile=$(get_filepath "$file") || missing_source_file "$file" msg2 "$(gettext "Adding %s...")" "${absfile##*/}" @@ -1289,7 +1292,7 @@ done for i in 'changelog' 'install'; do - local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") local file for file in $filelist; do # evaluate any bash variables used