aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-08-02 14:19:48 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-08-02 14:19:48 +0000
commitb3d5c3f5741530550c8e5121c1743711b4067193 (patch)
tree2c04968700e40e0149ba0e3623946872485d5a50 /Makefile
parent87fdd5931744b65b3db2f191bcd9984928d87132 (diff)
downloadxen-b3d5c3f5741530550c8e5121c1743711b4067193.tar.gz
xen-b3d5c3f5741530550c8e5121c1743711b4067193.tar.bz2
xen-b3d5c3f5741530550c8e5121c1743711b4067193.zip
bitkeeper revision 1.1108.50.1 (410e4d841op690UkyuQmjW5t-Sx0CQ)
Merged a bunch of 2.4 and 2.6 files that were mostly common.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a6d29f95d8..f02a4ab092 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ dist: all
LINUX_RELEASE ?= 2.4
LINUX_VER ?= $(shell ( /bin/ls -ld linux-$(LINUX_RELEASE).*-xen-sparse ) 2>/dev/null | \
sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
-LINUX24_VER ?= $(shell ( /bin/ls -ld linux-2.4.*-xen-sparse ) 2>/dev/null | \
+LINUX26_VER ?= $(shell ( /bin/ls -ld linux-2.6.*-xen-sparse ) 2>/dev/null | \
sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
LINUX_CONFIG_DIR ?= $(INSTALL_DIR)/boot
LINUX_SRC_PATH ?= .:..
@@ -133,7 +133,7 @@ mrproper: clean
rm -rf install/* patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
make-symlinks: delete-symlinks
- ln -sf linux-$(LINUX24_VER)-xen-sparse linux-xen-sparse
+ ln -sf linux-$(LINUX26_VER)-xen-sparse linux-xen-sparse
delete-symlinks:
$(RM) linux-xen-sparse