Diff

Differences From Artifact [9552d0e034]:

To Artifact [68229c87b4]:


   110    110   		esac
   111    111   
   112    112   		if [ -z "${pkgdomain}" ]; then
   113    113   			pkgdomain="${domain}"
   114    114   		fi
   115    115   
   116    116   		pkgfound='0'
   117         -		for pkgdir in "/opt/appfs/${pkgdomain}/${pkg}/platform"/${pkgversion:-*}; do
          117  +		for pkgdir in "/opt/appfs/${pkgdomain}/${pkg}/platform"/${pkgversion:-latest} "/opt/appfs/${pkgdomain}/${pkg}/platform"/${pkgversion:-*}; do
   118    118   			pkgconfigdir="${pkgdir}/lib/pkgconfig"
   119    119   
   120         -			if [ -d "${pkgdir}" ]; then
   121         -				pkgfound='1'
          120  +			if [ ! -d "${pkgdir}" ]; then
          121  +				continue
          122  +			fi
          123  +
          124  +			# If the package version was unspecified, fully resolve
          125  +			# the directory that we found
          126  +			if [ -z "${pkgversion}" ]; then
          127  +				pkgdir="$(readlink -f "${pkgdir}")"
   122    128   			fi
          129  +
          130  +			pkgfound='1'
   123    131   
   124    132   			for pkgchange in "${pkgchanges[@]}"; do
   125    133   				case "${pkgchange}" in
   126    134   					CFLAGS)
   127    135   						CFLAGS="${CFLAGS} -I${pkgdir}/include"
   128    136   						CPPFLAGS="${CPPFLAGS} -I${pkgdir}/include"
   129    137   						export CFLAGS CPPFLAGS