diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 16:53:39 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 16:53:39 +0100 |
| commit | 7ffd47fbf69a7a972c1f7fd27757b86e3d710643 (patch) | |
| tree | 48641c31acacb331257688962a32a25fc6c1218b /buildconfigs/Rules.mk | |
| parent | 2023a310ed01c3f45167128f9fcdf2ce5e43157a (diff) | |
| download | xen-7ffd47fbf69a7a972c1f7fd27757b86e3d710643.tar.gz xen-7ffd47fbf69a7a972c1f7fd27757b86e3d710643.tar.bz2 xen-7ffd47fbf69a7a972c1f7fd27757b86e3d710643.zip | |
[SOLARIS] Use GNU grep on Solaris.
Signed-off-by: John Levon <john.levon@sun.com>
Diffstat (limited to 'buildconfigs/Rules.mk')
| -rw-r--r-- | buildconfigs/Rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index ae61ea0095..9e64c5a5eb 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -22,7 +22,7 @@ endif # Expand Linux series to Linux version LINUX_SERIES ?= 2.6 -LINUX_VER ?= $(shell grep "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//') +LINUX_VER ?= $(shell $(GREP) "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//') # Setup Linux search path LINUX_SRC_PATH ?= .:.. @@ -125,7 +125,7 @@ config-update-pae: ifeq ($(XEN_TARGET_X86_PAE),y) sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) else - grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true + $(GREP) '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true endif # never delete any intermediate files. |