summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2007-09-20 18:35:32 +0200
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2007-09-20 18:35:32 +0200
commitc07fe54c98eac73c2e517425928ba7eaa0ff4dff (patch)
tree883c0a76db6881f118cf193f304425a8c056c53f
parenta1d160b1dc9d5e65a87f1ddc8a0f595701a69d25 (diff)
check in Makefile for *.title files instead of in gipfel2html
-rw-r--r--examples/Makefile5
-rwxr-xr-xexamples/gipfel2html8
2 files changed, 6 insertions, 7 deletions
diff --git a/examples/Makefile b/examples/Makefile
index 19e6f74..f76bc32 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -50,5 +50,8 @@ gipfelweb/gipfel/index.gipfel: $(positions)
gipfelweb/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.imgs $(thumbs)
gipfel2html images $* > $@
+gipfelweb/hills/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.hills %.title
+ gipfel2html hills "`cat $*.title`" $* > $@
+
gipfelweb/hills/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.hills
- gipfel2html hills $* > $@
+ gipfel2html hills $* $* > $@
diff --git a/examples/gipfel2html b/examples/gipfel2html
index 35328c3..36720be 100755
--- a/examples/gipfel2html
+++ b/examples/gipfel2html
@@ -1,7 +1,8 @@
#!/bin/sh
MODE="$1"
-FILE="$2"
+TITLE="$2"
+FILE="$3"
if [ "$MODE" = "images" ]; then
DATAFILE="gipfelweb/gipfel/${FILE}.imgs"
@@ -9,11 +10,6 @@ else
DATAFILE="gipfelweb/gipfel/${FILE}.hills"
fi
-TITLE=""
-if [ -e "${FILE}.title" ]; then
- TITLE=`cat ${FILE}.title`
-fi
-
cat << EOF
<html>
<head>