From f971df16c7e8356038a552918c130c87637f331e Mon Sep 17 00:00:00 2001
From: Eric Renfro <psi-jack@midgaard.home.ld>
Date: Wed, 18 Feb 2015 13:53:35 -0500
Subject: [PATCH] Adjusted paths and Makefile suitable for /opt installation
 method

---
 Makefile           | 2 +-
 bin/ca-create-cert | 2 +-
 bin/ca-init        | 2 +-
 bin/ca-renew-cert  | 2 +-
 bin/ca-revoke-cert | 2 +-
 lib/ca-functions   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 300d075..d15bc53 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ PKG_NAME=$(NAME)-$(VERSION)
 PKG=$(PKG_DIR)/$(PKG_NAME)_$(VERSION).tar.gz
 SIG=$(PKG_DIR)/$(PKG_NAME).asc
 
-PREFIX?=/usr/local
+PREFIX?=/opt/$(NAME)
 DOC_DIR=$(PREFIX)/share/doc/$(PKG_NAME)
 
 pkg:
diff --git a/bin/ca-create-cert b/bin/ca-create-cert
index 5b1bcac..ac7f1de 100755
--- a/bin/ca-create-cert
+++ b/bin/ca-create-cert
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $(dirname $(dirname $0))/lib/ca-functions
+source $(dirname $(dirname $0))/../lib/ca-functions
 
 ALT_NAMES=()
 QUALIFY=1
diff --git a/bin/ca-init b/bin/ca-init
index fa2204c..c45f95f 100755
--- a/bin/ca-init
+++ b/bin/ca-init
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $(dirname $(dirname $0))/lib/ca-functions
+source $(dirname $(dirname $0))/../lib/ca-functions
 
 # XXX: Add an interactive mode to this script to obviate the need for a
 # pre-existing config file? e.g.
diff --git a/bin/ca-renew-cert b/bin/ca-renew-cert
index 868b8db..7eaeeab 100755
--- a/bin/ca-renew-cert
+++ b/bin/ca-renew-cert
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $(dirname $(dirname $0))/lib/ca-functions
+source $(dirname $(dirname $0))/../lib/ca-functions
 
 usage() {
     cat <<__EOT__
diff --git a/bin/ca-revoke-cert b/bin/ca-revoke-cert
index 3dbd1ab..102366a 100755
--- a/bin/ca-revoke-cert
+++ b/bin/ca-revoke-cert
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source $(dirname $(dirname $0))/lib/ca-functions
+source $(dirname $(dirname $0))/../lib/ca-functions
 
 usage() {
     cat <<__EOT__
diff --git a/lib/ca-functions b/lib/ca-functions
index 46e24ff..1f3ec3f 100644
--- a/lib/ca-functions
+++ b/lib/ca-functions
@@ -3,7 +3,7 @@
 
 PROGNAME=$( basename $0 )
 CONFFILE="/etc/ca-scripts.conf"
-SHAREDIR=$(dirname $(dirname $0))/tpl
+SHAREDIR=$(dirname $(dirname $0))/../tpl
 CRYPTKEY="-nodes"
 
 INDEXTPL="index-html"