anchor.diff:  	# libgcc-dev should be responsible for that, but it's not getting built
   	# RP: it gets smashed up depending on the order that gcc, gcc-cross and 
   	# gcc-cross-sdk get built :( (30/11/07)
  -	#ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
  +	#ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/lib/libgcc_s.so
   
   	# With sysroot support, gcc expects the default C++ headers to be
   	# in a specific place.
  -	#install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include
  -	#mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \
  -	#	${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
  +	#install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/include
  +	#mv ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/usr/include/c++ \
  +	#	${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/include/
   
   	# Fix or remove broken .la files
  -	for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do
  -		sed -i 	-e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1\$SDK_PATH/\$TARGET_SYS${layout_base_libdir},g" \
  -			-e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1\$SDK_PATH/\$TARGET_SYS${layout_libdir},g" \
  -			-e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1\$SDK_PATH/\$TARGET_SYS${layout_base_libdir},g" \
  -			-e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1\$SDK_PATH/\$TARGET_SYS${layout_libdir},g" \
  +	for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do
  +		sed -i 	-e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1\$SDK_PATH/\$TARGET_SYS${base_libdir},g" \
  +			-e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1\$SDK_PATH/\$TARGET_SYS${libdir},g" \
  +			-e "/^dependency_libs=/s,\-\([LR]\)${base_libdir},-\1\$SDK_PATH/\$TARGET_SYS${base_libdir},g" \
  +			-e "/^dependency_libs=/s,\-\([LR]\)${libdir},-\1\$SDK_PATH/\$TARGET_SYS${libdir},g" \
   			-e "/^dependency_libs=/s,${TOOLCHAIN_SYSPATH},\$TOOLCHAIN_PATH/\$TARGET_SYS,g" \
   			-e 's/^installed=yes$/installed=no/' $i
   	done
  -	rm -f ${SDK_OUTPUT}/${prefix}/lib/*.la
  +	rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la
   
   	# Setup site file for external use
  -	siteconfig=${SDK_OUTPUT}/${prefix}/site-config
  +	siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config
   	touch $siteconfig
   	for sitefile in ${CONFIG_SITE} ; do
   		cat $sitefile >> $siteconfig
   	done
   
   	# Create environment setup script
  -	script=${SDK_OUTPUT}/${prefix}/environment-setup
  +	script=${SDK_OUTPUT}/${SDKPATH}/environment-setup
   	touch $script
  -	echo 'export SDK_PATH=${prefix}' >> $script
  +	echo 'export SDK_PATH=${SDKPATH}' >> $script
   	echo 'export TOOLCHAIN_PATH=${TOOLCHAIN_PATH}' >> $script
   	echo 'export TARGET_SYS=${TARGET_SYS}' >> $script
   	echo 'export PATH=$SDK_PATH/bin:$TOOLCHAIN_PATH/bin:$PATH' >> $script
   	echo 'export CPATH=$SDK_PATH/$TARGET_SYS/usr/include:$CPATH' >> $script
   	echo 'export LIBTOOL_SYSROOT_PATH=$SDK_PATH/$TARGET_SYS' >> $script
   	echo 'export PKG_CONFIG_SYSROOT_DIR=$SDK_PATH/$TARGET_SYS' >> $script
  -	echo 'export PKG_CONFIG_PATH=$SDK_PATH/$TARGET_SYS${layout_libdir}/pkgconfig' >> $script
  +	echo 'export PKG_CONFIG_PATH=$SDK_PATH/$TARGET_SYS${libdir}/pkgconfig' >> $script
   	echo 'export CONFIG_SITE=$SDK_PATH/site-config' >> $script
  -	echo 'alias opkg="LD_LIBRARY_PATH=$SDK_PATH/lib $SDK_PATH/bin/opkg-cl -f $SDK_PATH${layout_sysconfdir}/opkg-sdk.conf -o $SDK_PATH"' >> $script
  -	echo 'alias opkg-target="LD_LIBRARY_PATH=$SDK_PATH/lib $SDK_PATH/bin/opkg-cl -f $SDK_PATH/$TARGET_SYS${layout_sysconfdir}/opkg.conf -o $SDK_PATH/$TARGET_SYS"' >> $script
  +	echo 'alias opkg="LD_LIBRARY_PATH=$SDK_PATH/lib $SDK_PATH/bin/opkg-cl -f $SDK_PATH${sysconfdir}/opkg-sdk.conf -o $SDK_PATH"' >> $script
  +	echo 'alias opkg-target="LD_LIBRARY_PATH=$SDK_PATH/lib $SDK_PATH/bin/opkg-cl -f $SDK_PATH/$TARGET_SYS${sysconfdir}/opkg.conf -o $SDK_PATH/$TARGET_SYS"' >> $script
   
   	# Add version information
  -	versionfile=${SDK_OUTPUT}/${prefix}/version
  +	versionfile=${SDK_OUTPUT}/${SDKPATH}/version
   	touch $versionfile
   	echo 'Distro: ${SDK_DISTRO}' >> $versionfile
   	echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
  
positive.code: do_populate_sdk() {
  	rm -rf ${SDK_OUTPUT}
  	mkdir -p ${SDK_OUTPUT}
  
  	package_generate_ipkg_conf
  
  
negative.code: TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}"
  
  modify_opkg_conf () {
          OUTPUT_OPKGCONF_TARGET="${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/opkg.conf"
          OUTPUT_OPKGCONF_HOST="${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/opkg-sdk.conf"
          OUTPUT_OPKGCONF_SDK="${SDK_OUTPUT}/${sysconfdir}/opkg-sdk.conf"
          rm -f ${OUTPUT_OPKGCONF_TARGET}
          rm -f ${OUTPUT_OPKGCONF_HOST}
          rm -f ${OUTPUT_OPKGCONF_SDK}
          opkgarchs="${PACKAGE_ARCHS}"
          priority=1
          for arch in ${opkgarchs}; do
  