From 993d1a584f7aff8d0975495bef81850c756eec10 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 15 Apr 2015 15:06:13 -0400
Subject: Fix issues with Makefile

 - the entries in generated .gitignore's had prefixes
 - because sitestatic/logos/ was empty, it got removed; teach Makefile to
   create it
---
 Makefile              |  4 ++--
 sitestatic/.gitignore | 36 ++++++++++++++++++------------------
 visualize/.gitignore  |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 75540c3e..506dc288 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ clean: sitestatic/.gitignore visualize/.gitignore
 .PHONY: all clean
 
 %/.gitignore: $(MAKEFILE_LIST)
-	printf -- '%s\n' $(filter $*/%,$(targets)) > $@
+	printf -- '%s\n' $(patsubst $*%,%,$(filter $*/%,$(targets))) | LC_COLLATE=C sort > $@
 
 # Turn on sane error handling
 .DELETE_ON_ERROR:
@@ -94,7 +94,7 @@ sitestatic/homepage.js: sitestatic/bootstrap-typeahead.min.js sitestatic/konami.
 visualize/static/d3-$(d3-ver).js: %: $(www)/https/raw.github.com/mbostock/d3/v$(d3-ver)/d3.js
 	cp $< $@
 
-$(foreach i,$(images),$(eval $i: $$(branding)/$(notdir $i); cp $$< $$@))
+$(foreach i,$(images),$(eval $i: $$(branding)/$(notdir $i); install -Dm644 $$< $$@))
 
 
 # The minimization processes
diff --git a/sitestatic/.gitignore b/sitestatic/.gitignore
index 2009cb1d..5d3b3cb6 100644
--- a/sitestatic/.gitignore
+++ b/sitestatic/.gitignore
@@ -1,18 +1,18 @@
-sitestatic/bootstrap-typeahead.js
-sitestatic/bootstrap-typeahead.min.js
-sitestatic/homepage.js
-sitestatic/homepage.min.js
-sitestatic/jquery-1.8.3.js
-sitestatic/jquery-1.8.3.min.js
-sitestatic/jquery.tablesorter-2.7.js
-sitestatic/jquery.tablesorter-2.7.min.js
-sitestatic/konami.js
-sitestatic/konami.min.js
-sitestatic/favicon.ico
-sitestatic/silhouette.png
-sitestatic/archnavbar/archlogo.png
-sitestatic/logos/apple-touch-icon-114x114.png
-sitestatic/logos/apple-touch-icon-144x144.png
-sitestatic/logos/apple-touch-icon-57x57.png
-sitestatic/logos/apple-touch-icon-72x72.png
-sitestatic/logos/icon-transparent-64x64.png
+/archnavbar/archlogo.png
+/bootstrap-typeahead.js
+/bootstrap-typeahead.min.js
+/favicon.ico
+/homepage.js
+/homepage.min.js
+/jquery-1.8.3.js
+/jquery-1.8.3.min.js
+/jquery.tablesorter-2.7.js
+/jquery.tablesorter-2.7.min.js
+/konami.js
+/konami.min.js
+/logos/apple-touch-icon-114x114.png
+/logos/apple-touch-icon-144x144.png
+/logos/apple-touch-icon-57x57.png
+/logos/apple-touch-icon-72x72.png
+/logos/icon-transparent-64x64.png
+/silhouette.png
diff --git a/visualize/.gitignore b/visualize/.gitignore
index 943783c0..5b990033 100644
--- a/visualize/.gitignore
+++ b/visualize/.gitignore
@@ -1,2 +1,2 @@
-visualize/static/d3-3.0.6.js
-visualize/static/d3-3.0.6.min.js
+/static/d3-3.0.6.js
+/static/d3-3.0.6.min.js
-- 
cgit v1.2.3