X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile;h=461a904954aaa797c882cadf7627809bd24c0593;hb=cae7a6a607bc279421bfcc153b941eb0d680902a;hp=b4c529eca387cc0b24a5fb30b62be3b7523e269a;hpb=194711146afb5a966b099558e4a1086878cd82de;p=mkws-moved-to-github.git

diff --git a/doc/Makefile b/doc/Makefile
index b4c529e..461a904 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,32 +4,26 @@
 #	texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
 
 DOCS = index.html index.pdf \
-       README.html README.pdf \
        mkws-manual.html mkws-manual.pdf \
-       mkws-developer.html mkws-developer.pdf
+       mkws-developer.html mkws-developer.pdf \
+       mkws-doc.css
 
-INSTALLABLE = index.html README.html mkws-manual.html mkws-developer.html mkws-doc.css
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
+INSTALLED = $(DOCS:%=../tools/htdocs/%)
 
-install: $(INSTALLED)
-
-uninstall:
-	rm -f $(INSTALLED)
+all: $(INSTALLED)
 
 ../tools/htdocs/%: %
 	rm -f $@
-	cp -p $? $@
+	cp $< $@
 	chmod ugo-w $@
 
-all: $(DOCS)
-
 # For a description of pandoc's markdown format, see:
-# http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html -->
+# http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html
 
 # for older pandoc (<1.9) run first:
 # perl -i.bak -npe 's/"(Authors|Subjects)": "(.*?)"/"$1": "test"/' tools/htdocs/mkws-manual.markdown
 #
-%.html: %.markdown tweak-html
+../tools/htdocs/%.html: %.markdown tweak-html
 	rm -f $@
 	pandoc --standalone --toc -c mkws-doc.css $< | ./tweak-html > $@
 	chmod ugo-w $@
@@ -37,23 +31,24 @@ all: $(DOCS)
 # ### In order to compile the manual, which has tables, to PDF,
 # you will need to install the Debian package
 #	texlive-latex-recommended
-%.pdf: %.markdown
+../tools/htdocs/%.pdf: %.markdown
 	rm -f $@
 	pandoc --standalone $< -o $@
 	chmod ugo-w $@
 
 clean:
-	rm -f $(DOCS)
+	rm -f $(INSTALLED)
 	rm -f *.drupal.html
 
-distclean: clean uninstall
+distclean: clean
+	# Nothing more to remove in the doc directory
 
 push:
-	pandoc --toc README.markdown > README.drupal.html
+	pandoc --toc index.markdown > index.drupal.html
 	pandoc --toc mkws-manual.markdown > mkws-manual.drupal.html
-	cat README.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/332?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
+	cat index.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/332?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
 	cat mkws-manual.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/323?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
 
 help:
-	@echo "make [ all | install | clean | distclean | push ]"
+	@echo "make [ all | clean | push ]"