Merge from master

This commit is contained in:
Tony Garnock-Jones 2012-05-05 19:13:24 -04:00
commit 3aa2b82bac
1 changed files with 1 additions and 2 deletions

View File

@ -12,7 +12,6 @@ all: \
thirdparty/_dist \ thirdparty/_dist \
message.ml amqp_spec.ml \ message.ml amqp_spec.ml \
$(APP).native \ $(APP).native \
web/bootstrap/css/bootstrap.css \
webpages webpages
thirdparty/_dist: thirdparty/_dist:
@ -25,7 +24,7 @@ thirdparty/_dist:
OCAMLFIND_DESTDIR="$(CURDIR)/$@" \ OCAMLFIND_DESTDIR="$(CURDIR)/$@" \
make install)) make install))
webpages: $(HTML) webpages: $(HTML) web/bootstrap/css/bootstrap.css
web/bootstrap/css/bootstrap.css: web/bootstrap/less/*.less web/bootstrap/css/bootstrap.css: web/bootstrap/less/*.less
recess --compile web/bootstrap/less/bootstrap.less > $@ recess --compile web/bootstrap/less/bootstrap.less > $@