From 39c8f32ed3f091639f8715d2d381a74729164d72 Mon Sep 17 00:00:00 2001
From: Ben Lynn <blynn@cs.stanford.edu>
Date: Sat, 4 Nov 2006 19:26:33 -0800
Subject: [PATCH] Sat Nov  4 19:26:33 PST 2006     Fixed installation bugs
 reported by Peter Suetterlin.

    [netwalk-0.4.10.tgz]
---
 Makefile            | 14 +++++++++++---
 NEWS                |  5 +++++
 linux/config_file.c |  4 +---
 sharedir.h          |  1 +
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 sharedir.h

diff --git a/Makefile b/Makefile
index e3b1179..69288e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.4.9
+VERSION=0.4.10
 ALLFILES = *.[ch] Makefile LICENSE README copyright NEWS linux/*.[ch] win32/*.[ch] Vera.ttf
 PROJNAME = netwalk
 OS ?= linux
@@ -18,8 +18,15 @@ endif
 
 .PHONY: target clean dist
 
-target : version.h $(PROJNAME)
+target : version.h sharedir.h $(PROJNAME)
 
+sharedir.h : ./Makefile
+ifeq ("$(OS)", "win32")
+	echo '#define NETWALK_SHARE_DIR "."' > sharedir.h
+else
+	echo '#define NETWALK_SHARE_DIR "'$(PREFIX)'/share/netwalk"' > sharedir.h
+
+endif
 version.h : ./Makefile
 	echo '#define VERSION_STRING "'$(VERSION)'"' > version.h
 
@@ -56,9 +63,10 @@ zip : target
 else
 
 install : netwalk
+	$(INSTALL) -d $(PREFIX)/bin
 	$(INSTALL) -m 755 netwalk $(PREFIX)/bin
 	$(INSTALL) -d $(PREFIX)/share/$(PROJNAME)
-	$(INSTALL) -m 644 helmetr.ttf $(PREFIX)/share/$(PROJNAME)/
+	$(INSTALL) -m 644 Vera.ttf $(PREFIX)/share/$(PROJNAME)/
 
 uninstall : clean
 	-rm -f $(PREFIX)/bin/$(PROJNAME)
diff --git a/NEWS b/NEWS
index 4021521..401f4f0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Sat Nov  4 19:26:33 PST 2006
+    Fixed installation bugs reported by Peter Suetterlin.
+
+    [netwalk-0.4.10.tgz]
+
 Tue May  9 13:19:01 PDT 2006
     Applied hymie's <http://www.smart.net/~hymowitz> patch. Window caption
     now shows difficulty level.
diff --git a/linux/config_file.c b/linux/config_file.c
index d83c122..d539df2 100644
--- a/linux/config_file.c
+++ b/linux/config_file.c
@@ -1,13 +1,11 @@
 #include "config.h"
+#include "sharedir.h"
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define NETWALK_SHARE_DIR "."
-//#define NETWALK_SHARE_DIR "/usr/share/netwalk"
-
 FILE *config_get_fp()
 {
     FILE *fp;
diff --git a/sharedir.h b/sharedir.h
new file mode 100644
index 0000000..5523a4c
--- /dev/null
+++ b/sharedir.h
@@ -0,0 +1 @@
+#define NETWALK_SHARE_DIR "/usr/share/netwalk"
-- 
2.11.4.GIT