X-Git-Url: http://nitlanguage.org

diff --git a/Makefile b/Makefile
index e52265e..da0acf0 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ NITCOPT=
 # Additional program directories (contrib and examples) that are buildable
 PROGS=$(dir $(wildcard examples/*/Makefile contrib/*/Makefile))
 
-all: tools
+all: tools man
 
 # Compile all programs in $PROGS
 full: all
@@ -40,39 +40,41 @@ doc/stdlib/index.html: bin/nitdoc bin/nitls
 	@echo '***************************************************************'
 	@echo '* Generate doc for NIT standard library                       *'
 	@echo '***************************************************************'
-	bin/nitdoc $$(bin/nitls lib -r --path) -d doc/stdlib \
+	bin/nitdoc lib -d doc/stdlib \
 		--custom-title "Nit Standard Library" \
 		--custom-brand "<a href=\"http://nitlanguage.org/\">Nitlanguage.org</a>" \
 		--custom-overview-text "<p>Documentation for the standard library of Nit<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
 		--custom-footer-text "Nit standard library. Version $$(git describe)." \
-		--github-upstream "privat:nit:master" \
+		--github-upstream "nitlang:nit:master" \
 		--github-base-sha1 "$$(git rev-parse HEAD)" \
 		--github-gitdir "." \
-		--source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
+		--source "https://github.com/nitlang/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
 		--piwik-tracker "pratchett.info.uqam.ca/piwik/" \
 		--piwik-site-id "2" \
 
-doc/nitc/index.html: bin/nitdoc
-	bin/nitdoc $$(bin/nitls lib -r --path) src/nit*.nit src/test_*.nit -d doc/nitc \
+doc/nitc/index.html: bin/nitdoc bin/nitls
+	bin/nitdoc lib src/nit*.nit src/test_*.nit -d doc/nitc \
 		--private \
 		--custom-title "Nit Compilers and Tools" \
 		--custom-brand "<a href=\"http://nitlanguage.org/\">Nitlanguage.org</a>" \
 		--custom-overview-text "<p>Documentation for the Nit tools<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
 		--custom-footer-text "Nit tools. Version $$(git describe)." \
-		--github-upstream "privat:nit:master" \
+		--github-upstream "nitlang:nit:master" \
 		--github-base-sha1 "$$(git rev-parse HEAD)" \
 		--github-gitdir "." \
-		--source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
+		--source "https://github.com/nitlang/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
 		--piwik-tracker "pratchett.info.uqam.ca/piwik/" \
 		--piwik-site-id "3"
 
+man:
+	$(MAKE) -C share/man
+
 clean:
-	rm -rf -- .nit_compile 2> /dev/null || true
 	rm -rf -- doc/stdlib doc/nitc || true
 	cd c_src; make clean
 	cd src; make clean
 	cd tests; make clean
+	cd share/man; make clean
 	for m in $(PROGS); do \
 		$(MAKE) clean -C "$$m"; \
-		test -d $$m/.nit_compile && rm -r $$m/.nit_compile; \
 		done || true