Skip to content

B
bootstrap
Commit 9defc212 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch 'master' of https://github.com/twitter/bootstrap into dev

parents 869f1130 f285048b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ 9defc212
...@@ -3,11 +3,11 @@ DATE=$(shell DATE) ...@@ -3,11 +3,11 @@ DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap.css BOOTSTRAP = ./bootstrap.css
BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_MIN = ./bootstrap.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc` LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr` WATCHR ?= `which watchr`
build: 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; \ 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}; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment