X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=Makefile;h=cbf8c619de23fc3a221eb844df6d1d5fb7026adc;hp=a1373e3008b00acd01d3ca89622db149aad058a4;hb=ab26ff591fbbaf202c3d95af6c50df747513d8ea;hpb=d130478a35696e78eb2fd6e55b09e6885a9c2a23 diff --git a/Makefile b/Makefile index a1373e3..cbf8c61 100644 --- a/Makefile +++ b/Makefile @@ -18,17 +18,19 @@ java = java $(jvmargs) $(profile) -cp src:$(ghclibs):$(sbp)/edu.berkeley.sbp.ja scala = JAVA_OPTS="$(jvmargs)" scala wix = $(java) HaskellHelper +args = install: wix.jar aklog research.cs.berkeley.edu || true - $(scala) -cp wix.jar:lib/edu.berkeley.sbp.jar Main ~/docs/wix/src/ ~/docs/wix/dest/ - + $(scala) -cp wix.jar:lib/edu.berkeley.sbp.jar Main $(args) ~/docs/wix/src/ ~/docs/wix/dest/ # --delete disabled until I can keep it from clobbering GArrow.v rsync -arL --rsync-path=/usr/sww/bin/rsync \ --progress --verbose \ ~/docs/wix/dest/cs.berkeley.edu/ \ login.eecs.berkeley.edu:public_html/ +force:; make install args='-f' + docs: $(wix) xt2/docs/ ~/docs/