diff -r 860c6c633565 -r 21e86e18f344 samples/samples.mk --- a/samples/samples.mk Fri Nov 21 15:37:46 2008 +0000 +++ b/samples/samples.mk Mon Jan 26 18:36:02 2009 +0000 @@ -39,7 +39,7 @@ # print the list of all available samples PHONY += list-samples list-samples: .FORCE - @echo $(CT_SAMPLES) |sed -r -e 's/ /\n/g;' |sort + @echo $(CT_SAMPLES) |$(sed) -r -e 's/ /\n/g;' |sort wiki-samples: $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w $(CT_SAMPLES) @@ -76,7 +76,7 @@ echo ; \ echo '***********************************************************'; \ ) - $(SILENT)if grep -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \ + $(SILENT)if $(grep) -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \ echo ; \ echo 'WARNING! This sample may enable experimental features.'; \ echo ' Please be sure to review the configuration prior'; \ @@ -97,12 +97,12 @@ define build_sample @$(ECHO) ' CONF $(1)' $(SILENT)cp $(call sample_dir,$(1))/crosstool.config .config - $(SILENT)sed -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(2)":;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config - $(SILENT)sed -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config + $(SILENT)$(sed) -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(2)":;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config + $(SILENT)$(sed) -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config $(SILENT)$(MAKE) -rf $(CT_NG) V=0 oldconfig @$(ECHO) ' BUILD $(1)' $(SILENT)$(MAKE) -rf $(CT_NG) V=0 build @@ -131,5 +131,5 @@ # Build all samples, overiding the number of // jobs per sample build-all.%: - $(SILENT)$(MAKE) -rf $(CT_NG) V=$(V) $(shell echo "$(@)" |sed -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;') + $(SILENT)$(MAKE) -rf $(CT_NG) V=$(V) $(shell echo "$(@)" |$(sed) -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;')