]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Moves one @printf statement to be more accurate.
authorNicolas Dudebout <nicolas.dudebout@gatech.edu>
Wed, 2 Jan 2013 10:59:55 +0000 (05:59 -0500)
committerNicolas Dudebout <nicolas.dudebout@gatech.edu>
Mon, 14 Jan 2013 13:58:47 +0000 (08:58 -0500)
Makefile

index eb7356d7dafaec2d517c42178aa147f3512bffa6..75c5a5659348d66d4ea0fb7f98b2f14d6f063255 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ build:
        @cp js/*.js docs/assets/js/
        @cp js/tests/vendor/jquery.js docs/assets/js/
        @echo "                  ${CHECK} Done"
+       @printf "Compiling and minifying javascript..."
        @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
        @./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
        @echo "/**\n* Bootstrap.js v2.3.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
-       @printf "Compiling and minifying javascript..."
        @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
        @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
        @echo "       ${CHECK} Done"