mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-10-26 15:38:41 +03:00
Move Makefile to the talk directory
It is no longer needed outside this directory since it has mostly been replaced by setup.py. Always build the talk HTML, now that the Makefile is in a subdir, since subdir builds only happen when explicitly requested. Update the documentation to match the new build setup.
This commit is contained in:
parent
fd3dbfc431
commit
5c1b6f1552
8
Makefile
8
Makefile
@ -1,8 +0,0 @@
|
||||
all:
|
||||
|
||||
module := doc/presentations/GitMerge-2013
|
||||
|
||||
html: $(module)/talk.html
|
||||
|
||||
$(module)/talk.html: $(module)/talk.rst
|
||||
rst2s5 --theme=small-white --current-slide $< $@
|
6
doc/presentations/GitMerge-2013/Makefile
Normal file
6
doc/presentations/GitMerge-2013/Makefile
Normal file
@ -0,0 +1,6 @@
|
||||
all: html
|
||||
|
||||
html: talk.html
|
||||
|
||||
talk.html: talk.rst
|
||||
rst2s5 --theme=small-white --current-slide $< $@
|
@ -4,6 +4,6 @@ on "User Day".
|
||||
(I gave another, more technical talk on a whiteboard the day before at
|
||||
"Developer Day".)
|
||||
|
||||
To convert it into HTML, run "make html" in the top-level directory.
|
||||
To convert it into HTML, run "make html" in this directory.
|
||||
|
||||
-- Michael Haggerty
|
||||
|
Loading…
Reference in New Issue
Block a user