diff options
| author | Mark Otto <[email protected]> | 2012-01-24 19:57:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 19:57:48 -0800 |
| commit | c1dd1f586dcb5bafc927d4eb1b180a0737a62cd8 (patch) | |
| tree | 396362bf5d2bfb25a56921182ed10fb12187484b | |
| parent | c6d5dcd872dcc3aa16a269cb5b4a434a8960f58c (diff) | |
| parent | da1906b0373d621a46fdb9e6d2693477e92d9730 (diff) | |
| download | bootstrap-c1dd1f586dcb5bafc927d4eb1b180a0737a62cd8.tar.xz bootstrap-c1dd1f586dcb5bafc927d4eb1b180a0737a62cd8.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,7 +2,7 @@ VERSION=2.0.0 BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less -LESS_COMPESSOR ?= `which lessc` +LESS_COMPRESSOR ?= `which lessc` UGLIFY_JS ?= `which uglifyjs` WATCHR ?= `which watchr` @@ -11,7 +11,7 @@ WATCHR ?= `which watchr` # build: - @@if test ! -z ${LESS_COMPESSOR}; then \ + @@if test ! -z ${LESS_COMPRESSOR}; then \ 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; \ |