diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2011-09-16 22:24:07 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2011-09-16 22:24:07 +0400 |
| commit | c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee (patch) | |
| tree | 75c97593b25066d9c2d7bd76eef24e23d1f106d3 /Makefile | |
| parent | aa432390888bae158bbc3014eed9af55103d03aa (diff) | |
| parent | 427a001c476569684027567e5a7cec89058185ad (diff) | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
Makefile
README.md
bootstrap.css
bootstrap.min.css
lib/bootstrap.less
lib/scaffolding.less
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,3 +1,4 @@ +VERSION=1.2.0 DATE=$(shell DATE) BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css @@ -7,10 +8,10 @@ WATCHR ?= `which watchr` build: @@if test ! -z ${LESS_COMPESSOR}; then \ - sed '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 && \ + 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; \ echo "Bootstrap successfully built! - `date`"; \ else \ echo "You must have the LESS compiler installed in order to build Bootstrap."; \ |