fix a few issues in Makefile

* find the correct php executable
* don't ignore .gitignore
* fix problems with .gitignore and directories

3 files changed, 126 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 639f69d..3c706a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 # ignore everyting
 *
 # but these:
+!.gitignore
+!img
+img/*
 !img/swoosh.svg
 !style.scss
 !header.php.patch
diff --git a/Makefile b/Makefile
index c782b9b..f0eb157 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
+pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH)))))
+
 RM = rm -f
 CP = cp
 PATCH = patch
 SASS = sass
-PHP = php5
+PHP := $(firstword $(call pathsearch,php5) $(call pathsearch,php))
 
 srcfiles = \
+	.gitignore \
 	img/swoosh.svg \
 	style.scss \
 	header.php.patch \
@@ -32,10 +35,21 @@ style.css: logo-style.scss twentyeleven-fix.scss
 %.png: %.svg
 	rsvg-convert $< > $@.$$$$ && pngcrush $@.$$$$ $@ ; $(RM) $@.$$$$
 
+
+in_dir = $(patsubst ./%,%,$(dir $1))
+my_dir = $(patsubst %/,%,$(dir $1))
+define gitignore_file
+$(if $(in_dir),
+    $(call gitignore_file,$(my_dir))
+    echo '$(my_dir)/*' >> '$@';
+)
+echo '!$1' >> '$@';
+endef
+
 .gitignore: Makefile
 	echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@
 	echo '# '                 >> '$@'
 	echo '# ignore everyting' >> '$@'
 	echo '*'                  >> '$@'
 	echo '# but these:'       >> '$@'
-	for file in $(srcfiles); do echo !"$$file" >> '$@'; done
+	$(foreach file,$(srcfiles),$(call gitignore_file,$(file)))
diff --git a/img/swoosh.svg b/img/swoosh.svg
new file mode 100644
index 0000000..7c47d78
--- /dev/null
+++ b/img/swoosh.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="472.22217"
+   height="200"
+   id="svg3317"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="swoosh.svg"
+   inkscape:export-filename="/media/Development/Robotics/res/2009/Art/swoosh.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3319" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="144.20721"
+     inkscape:cy="95.640314"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1277"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3322">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(8.7936,98.031149)">
+    <g
+       id="g2987"
+       transform="matrix(1.7188591,0,0,1.7188591,6.3213594,-73.301236)">
+      <path
+         inkscape:export-ydpi="135.36015"
+         inkscape:export-xdpi="135.36015"
+         inkscape:export-filename="/media/Development/Robotics/res/2009/Art/swoosh.png"
+         d="M 37.90015,-14.3874 4.4389,69.05135 l -13.2325,32.9175 274.73,0 0,-116.35625 -228.03625,0 z"
+         style="fill:#2210d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path2558"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="135.36015"
+         inkscape:export-xdpi="135.36015"
+         inkscape:export-filename="/media/Development/Robotics/res/2009/Art/swoosh.png"
+         d="m 45.0439,68.6826 c 0,-33.42625 52.35375,-61.11375 120.685,-65.99875 2.66375,-0.18875 8.05,-0.10375 8.05,-0.8025 0,-1.7475 -8.5525,-1.49375 -12.89375,-1.49375 -81.06,0 -146.7525,36.7675 -146.7525,80.23625 0,7.3975 1.90625,14.5575 5.46375,21.345 l 44.36875,0 C 51.93015,92.1701 45.0439,80.80385 45.0439,68.6826"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path2564"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="135.36015"
+         inkscape:export-xdpi="135.36015"
+         inkscape:export-filename="/media/Development/Robotics/res/2009/Art/swoosh.png"
+         d="m 187.33765,7.1126 c -72.5425,0 -131.35,27.59125 -131.35,61.62875 0,12.23625 7.60125,23.64 20.70625,33.2275 l 189.2425,0 0,-82.60875 C 244.02015,11.6676 216.81265,7.1126 187.33765,7.1126"
+         style="fill:#1e90ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path2566"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="135.36015"
+         inkscape:export-xdpi="135.36015"
+         inkscape:export-filename="/media/Development/Robotics/res/2009/Art/swoosh.png"
+         d="m 206.1264,1.6901 c -0.0237,0.885 -15.815,1.165 -20.545,1.0325 -4.73125,-0.13125 -8.54625,-0.955 -8.52125,-1.84 0.025,-0.885 3.88,-1.49625 8.61,-1.365 4.73,0.13125 20.4825,1.2875 20.45625,2.1725"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path2580"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="135.36015"
+         inkscape:export-xdpi="135.36015"
+         inkscape:export-filename="/media/Development/Robotics/res/2009/Art/swoosh.png"
+         d="m 221.5464,3.79385 c -0.0613,0.45375 -7.78,-0.22 -10.07875,-0.53125 -2.30125,-0.3125 -4.115,-0.93375 -4.05375,-1.38875 0.0613,-0.45375 1.975,-0.56875 4.27625,-0.25625 2.3,0.3125 9.9175,1.7225 9.85625,2.17625"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path2582"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>