aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-03 23:12:36 -0700
committerJacob Thornton <[email protected]>2011-09-03 23:12:36 -0700
commit43b01d1b80764a92ded6b47269433e2ecfd1919b (patch)
tree83dd970900df547ad16d85d86021ca664c2bfb37
parent2589c0ac4ecc86feed81cfc5df344e0eb78cda64 (diff)
parentfe8cb55cc16fb0995428b7055c6f31c6a50f6ed5 (diff)
downloadbootstrap-43b01d1b80764a92ded6b47269433e2ecfd1919b.tar.xz
bootstrap-43b01d1b80764a92ded6b47269433e2ecfd1919b.zip
Merge pull request #149 from yury/version_var
use VERSION var in build script
-rw-r--r--Makefile7
-rw-r--r--lib/bootstrap.less2
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 82603c41f..b9bd7aeb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
+VERSION=1.2.0
DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.2.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
+BOOTSTRAP = ./bootstrap-${VERSION}.css
+BOOTSTRAP_MIN = ./bootstrap-${VERSION}.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
build:
@@if test ! -z ${LESS_COMPESSOR}; then \
- sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
+ sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
rm -f ${BOOTSTRAP_LESS}.tmp; \
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index c31bd725d..a46a6a760 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v1.2.0
+ * Bootstrap @VERSION
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0