diff options
| author | Mark Otto <[email protected]> | 2012-01-27 21:09:24 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 21:09:24 -0800 |
| commit | d0447e9aa54898ea46596e0e2077f33f0dbd1968 (patch) | |
| tree | 87f246db49b2130b5c7cc76ddde95f289f73cc00 /Makefile | |
| parent | 3934d1b6c4cb975967235547b77e90b4c8c91be2 (diff) | |
| parent | 15d3a4797f3435d1531804369df87fa4e574b874 (diff) | |
| download | bootstrap-d0447e9aa54898ea46596e0e2077f33f0dbd1968.tar.xz bootstrap-d0447e9aa54898ea46596e0e2077f33f0dbd1968.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -1,4 +1,3 @@ -VERSION=2.0.0 BOOTSTRAP = ./docs/assets/css/bootstrap.css BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css @@ -12,16 +11,11 @@ WATCHR ?= `which watchr` # build: - @@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}; \ - rm -f ${BOOTSTRAP_LESS}.tmp; \ - sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \ - lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \ - rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \ + @if test ! -z ${LESS_COMPRESSOR}; then \ + lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \ + lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \ node docs/build; \ cp img/* docs/assets/img/; \ - echo "Bootstrap successfully built! - `date`"; \ else \ echo "You must have the LESS compiler installed in order to build Bootstrap."; \ echo "You can install it by running: npm install less -g"; \ @@ -32,7 +26,7 @@ build: # watch: - @@if test ! -z ${WATCHR}; then \ + @if test ! -z ${WATCHR}; then \ echo "Watching less files..."; \ watchr -e "watch('less/.*\.less') { system 'make' }"; \ else \ @@ -40,5 +34,4 @@ watch: echo "You can install it by running: gem install watchr"; \ fi - .PHONY: build watch
\ No newline at end of file |