X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/ef53b4b27885a5064b497f24ec7e4aed2fc0fbea..0c936d24dccef20cdca0b5fb96c786731e284173:/Makefile

diff --git a/Makefile b/Makefile
index 3b2df00..a3d554d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-HPROGS = hbal hn1 hscan hail
+HPROGS = hbal hn1 hscan hail hspace
 HALLPROGS = $(HPROGS) test
 HSRCS := $(wildcard Ganeti/HTools/*.hs)
 HDDIR = apidoc
@@ -22,8 +22,8 @@ test: HEXTRA=-fhpc
 $(DOCS) : %.html : %
 	rst2html $< $@
 
-doc: $(DOCS)
-	rm -rf $(HDDIR)
+doc: $(DOCS) Ganeti/HTools/Version.hs
+	rm -rf $(HDDIR)/*
 	mkdir -p $(HDDIR)/Ganeti/HTools
 	cp hscolour.css $(HDDIR)/Ganeti/HTools
 	for file in $(HSRCS); do \
@@ -31,7 +31,7 @@ doc: $(DOCS)
 		$$file > $(HDDIR)/Ganeti/HTools/`basename $$file .hs`.html ; \
 	done
 	haddock --odir $(HDDIR) --html --ignore-all-exports \
-		-t htools -p haddock-prologue \
+		-t ganeti-htools -p haddock-prologue \
 		--source-module="%{MODULE/.//}.html" \
 		--source-entity="%{MODULE/.//}.html#%{NAME}" \
 		$(HSRCS)
@@ -53,11 +53,12 @@ Ganeti/HTools/Version.hs: Ganeti/HTools/Version.hs.in version
 
 dist: Ganeti/HTools/Version.hs version doc
 	VN=$$(cat version|sed 's/^v//') ; \
-	ANAME="htools-$$VN.tar" ; \
+	PFX="ganeti-htools-$$VN" ; \
+	ANAME="$$PFX.tar" ; \
 	rm -f $$ANAME $$ANAME.gz ; \
-	git archive --format=tar --prefix=htools-$$VN/ HEAD > $$ANAME ; \
+	git archive --format=tar --prefix=$$PFX/ HEAD > $$ANAME ; \
 	tar -r -f $$ANAME --owner root --group root \
-	    --transform="s,^,htools-$$VN/," version apidoc $(DOCS) ; \
+	    --transform="s,^,$$PFX/," version apidoc $(DOCS) ; \
 	gzip -v9 $$ANAME ; \
 	tar tzvf $$ANAME.gz