From a44385fe1e0195229dad28c7abb482923bb06776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 21 Oct 2013 20:38:59 +0200
Subject: [PATCH] Makefile vereinigt

---
 .cmd_ok                                |  0
 Makefile                               | 10 +++++++++-
 bericht/README.md => README.md         |  0
 bericht/Makefile                       |  9 ---------
 bericht/check_cmds.sh => check_cmds.sh |  0
 www/index.html                         |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 .cmd_ok
 rename bericht/README.md => README.md (100%)
 delete mode 100644 bericht/Makefile
 rename bericht/check_cmds.sh => check_cmds.sh (100%)

diff --git a/.cmd_ok b/.cmd_ok
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
index d2111d2..2ca20aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,10 @@
-upload:
+.cmd_ok:
+	./check_cmds.sh
+%.pdf: %.tex
+	latexmk -pdf $<
+all: .cmd_ok bericht/bericht.pdf
+	cp bericht/bericht.pdf www
+clean:
+	latexmk -CA
+upload: all
 	rsync -avc www/ lctp@devkid.net:/
diff --git a/bericht/README.md b/README.md
similarity index 100%
rename from bericht/README.md
rename to README.md
diff --git a/bericht/Makefile b/bericht/Makefile
deleted file mode 100644
index 9ac8c3d..0000000
--- a/bericht/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-.cmd_ok:
-	./check_cmds.sh
-%.pdf: %.tex
-	latexmk -pdf $<
-all: .cmd_ok bericht.pdf
-clean:
-	latexmk -CA
-upload: all
-	rsync -avc bericht.pdf lctp@devkid.net:bericht.pdf
diff --git a/bericht/check_cmds.sh b/check_cmds.sh
similarity index 100%
rename from bericht/check_cmds.sh
rename to check_cmds.sh
diff --git a/www/index.html b/www/index.html
index 3257b18..f24593c 100644
--- a/www/index.html
+++ b/www/index.html
@@ -51,7 +51,7 @@ footer {
     </section>
     <section id="bericht">
       <h2>Bericht</h2>
-      <a href="/bericht.pdf" class="pure-button pure-button-primary">Download</a>
+      <a href="bericht.pdf" class="pure-button pure-button-primary">Download</a>
     </section>
     <section id="team">
       <h2>Team</h2>