From 4685b0877438d7e18b664068d4f5a580b95fe887 Mon Sep 17 00:00:00 2001
From: Dave Hibberd <d@vehibberd.com>
Date: Thu, 3 Sep 2015 21:06:40 +0100
Subject: [PATCH] Added new patch for makefile, added new VAR_DIR

---
 debian/patches/folder-update |  4 ++--
 debian/patches/makefile      | 10 ++++++++++
 debian/patches/series        |  1 +
 debian/uronode.dirs          |  5 -----
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 debian/patches/makefile
 delete mode 100644 debian/uronode.dirs

diff --git a/debian/patches/folder-update b/debian/patches/folder-update
index 82aab26..7308edd 100644
--- a/debian/patches/folder-update
+++ b/debian/patches/folder-update
@@ -7,7 +7,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 @@ -1,5 +1,5 @@
  #!/bin/sh
 -
-+NON_INTERACTIVE == 1
++NON_INTERACTIVE="1"
  _sleep()
  {
    [ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
@@ -26,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +BIN_DIR=debian/uronode/usr/bin
 +LIB_DIR=debian/uronode/usr/lib
 +MAN_DIR=debian/uronode/usr/share/man
-+VAR_DIR=debian/uronode/usr/var/ax25
++VAR_DIR=debian/uronode/var/lib/ax25
  
  echo "Welcome to the configuration utility for URONode. This configure script"
  echo "will very simply and easily guide you into installling URONode with as"
diff --git a/debian/patches/makefile b/debian/patches/makefile
new file mode 100644
index 0000000..f75f591
--- /dev/null
+++ b/debian/patches/makefile
@@ -0,0 +1,10 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -33,6 +33,7 @@
+ 	install -m 644    -p etc/gateways	 $(VAR_DIR)/flex
+ 	
+ installbin: all
++	install -m 755    -D -d $(SBIN_DIR)
+ 	install -m 755 	-s -p	uronode		$(SBIN_DIR)
+ 	install -m 755  -s -p	nodeusers	$(SBIN_DIR)
+ 	install -m 755  -s -p	axdigi		$(SBIN_DIR)
diff --git a/debian/patches/series b/debian/patches/series
index 8425b1f..3023be6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 folder-update
+makefile
diff --git a/debian/uronode.dirs b/debian/uronode.dirs
deleted file mode 100644
index 51500a3..0000000
--- a/debian/uronode.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/ax25
-usr/sbin
-usr/share/man
-var/lib/uronode
-