mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-08-16 10:30:39 +03:00
Code Issues Projects Releases Wiki Activity

Move Makefile to the talk directory

Browse Source 
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:
Paul Wise 2020-10-26 06:39:46 +08:00
parent fd3dbfc431
commit 5c1b6f1552
No known key found for this signature in database
GPG Key ID: 3116BA5E9FFA69A3
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -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
View File

@ -0,0 +1,6 @@
all: html
html: talk.html
talk.html: talk.rst
rst2s5 --theme=small-white --current-slide $< $@

2
doc/presentations/GitMerge-2013/README.txt
View File

@ -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