diff --git a/Makefile b/Makefile index 80c2ad2..7afb146 100644 --- a/Makefile +++ b/Makefile @@ -14,42 +14,42 @@ XSLTPROC=xsltproc XSL=/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl prefix=/usr/packages/ccollect-git -bindir=$(prefix)/bin -destination=$(bindir)/$(CCOLLECT_DEST) +bindir=${prefix}/bin +destination=${bindir}/${CCOLLECT_DEST} path_dir=/usr/local/bin -path_destination=$(path_dir)/$(CCOLLECT_DEST) +path_destination=${path_dir}/${CCOLLECT_DEST} # where to publish host=home.schottelius.org dir=www/org/schottelius/unix/www/ccollect/ -docdir=$(dir)/doc +docdir=${dir}/doc # # Asciidoc will be used to generate other formats later # MANDOCS = doc/man/ccollect.text -DOCS = $(MANDOCS) doc/ccollect.text doc/ccollect-DE.text +DOCS = ${MANDOCS} doc/ccollect.text doc/ccollect-DE.text # # Doku # -HTMLDOCS = $(DOCS:.text=.html) -DBHTMLDOCS = $(DOCS:.text=.htm) +HTMLDOCS = ${DOCS:.text=.html} +DBHTMLDOCS = ${DOCS:.text=.htm} -TEXIDOCS = $(DOCS:.text=.texi) +TEXIDOCS = ${DOCS:.text=.texi} -MANPDOCS = $(MANDOCS:.text=.man) +MANPDOCS = ${MANDOCS:.text=.man} -DOCBDOCS = $(DOCS:.text=.docbook) +DOCBDOCS = ${DOCS:.text=.docbook} -DOC_ALL = $(HTMLDOCS) $(DBHTMLDOCS) $(TEXIDOCS) $(MANPDOCS) +DOC_ALL = ${HTMLDOCS} ${DBHTMLDOCS} ${TEXIDOCS} ${MANPDOCS} -html: $(HTMLDOCS) -htm: $(DBHTMLDOCS) -info: $(TEXIDOCS) -man: $(MANPDOCS) -documentation: $(DOC_ALL) +html: ${HTMLDOCS} +htm: ${DBHTMLDOCS} +info: ${TEXIDOCS} +man: ${MANPDOCS} +documentation: ${DOC_ALL} # # End user targets @@ -59,16 +59,16 @@ all: @echo "documentation: generate HTMl, Texinfo and manpage" @echo "html: only generate HTML" @echo "info: only generate Texinfo" - @echo "man: only generate manpage(s)" - @echo "install: install ccollect to $(prefix)" + @echo "man: only generate manpage{s}" + @echo "install: install ccollect to ${prefix}" install: install-script install-link install-link: install-script - $(LN) $(destination) $(path_destination) + ${LN} ${destination} ${path_destination} install-script: - $(INSTALL) -D -m 0755 $(CCOLLECT_SOURCE) $(destination) + ${INSTALL} -D -m 0755 ${CCOLLECT_SOURCE} ${destination} # docbook gets .htm, asciidoc directly .html @@ -104,18 +104,18 @@ push-work: @cg-push sygroup publish-doc: documentation - @echo "Transferring files to $(host)" - @chmod a+r $(DOCS) $(DOC_ALL) - @tar c $(DOCS) $(DOC_ALL) | ssh $(host) "cd $(dir); tar xv" + @echo "Transferring files to ${host}" + @chmod a+r ${DOCS} ${DOC_ALL} + @tar c ${DOCS} ${DOC_ALL} | ssh ${host} "cd ${dir}; tar xv" # # Distribution # allclean: - rm -f $(DOC_ALL) + rm -f ${DOC_ALL} distclean: allclean - rm -f $(DOCBDOCS) + rm -f ${DOCBDOCS} # # Be nice with the users and generate documentation for them