]> git.madduck.net Git - cv.git/blobdiff - Makefile

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

fixes
[cv.git] / Makefile
index b5f25ab5402be639c9c165f8006bf5058d231943..bf48c09fade88cad120bfcf4152d444609528b5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ COMPONENTS = cv tech-profile refs
 LANGUAGES = en
 
 RST2HTML = rst2html
 LANGUAGES = en
 
 RST2HTML = rst2html
-RST2HTML_OPTS = --strict --tab-width=2 --initial-header-level=2 --link-stylesheet
+RST2HTML_OPTS = --tab-width=2 --initial-header-level=2 --link-stylesheet
 RST2HTML_OPTS := $(RST2HTML_OPTS) --cloak-email-addresses
 
 SUFFIX = html
 RST2HTML_OPTS := $(RST2HTML_OPTS) --cloak-email-addresses
 
 SUFFIX = html
@@ -57,7 +57,7 @@ ref-%: RST2HTML_OPTS := $(RST2HTML_OPTS) --stylesheet=ref.css --language=en
 push: DEST_SERVER = seamus
 push: DEST_DIR = /srv/apache2/martin-krafft.net/htdocs/cv
 push: pdfs
 push: DEST_SERVER = seamus
 push: DEST_DIR = /srv/apache2/martin-krafft.net/htdocs/cv
 push: pdfs
-       test -z "$$(svn stat)" || svn commit
+       git push
        rsync *.pdf $(DEST_SERVER):$(DEST_DIR)
        ssh $(DEST_SERVER) make -C $(DEST_DIR) update
 
        rsync *.pdf $(DEST_SERVER):$(DEST_DIR)
        ssh $(DEST_SERVER) make -C $(DEST_DIR) update
 
@@ -69,5 +69,5 @@ clean:
 
 .PHONY: update
 update:
 
 .PHONY: update
 update:
-       svn up
+       git pull
        $(MAKE)
        $(MAKE)