From: Antonio Ospite <ospite@studenti.unina.it>
Date: Sun, 24 Nov 2013 18:05:17 +0000 (+0100)
Subject: Merge tag 'v0.4' into debian
X-Git-Tag: debian/0.4-1~1
X-Git-Url: https://git.ao2.it/kboot-utils.git/commitdiff_plain/d0994bb6ab2f9fe5e0753d5b1f0c7890df91aaff?hp=2cf6425360b328e98ad380d29a5ce3e8a29b0bdc

Merge tag 'v0.4' into debian

Release v0.4
---

diff --git a/ChangeLog b/ChangeLog
index bb12e0c..a065fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2013-11-24 18:58:08 +0100  Antonio Ospite  <ospite@studenti.unina.it>
+
+	* Install kboot-mkconfig_lib under /usr/share/kboot (HEAD, master)
+
+2013-11-19 15:06:27 +0100  Antonio Ospite  <ospite@studenti.unina.it>
+
+	* ChangeLog: update for v0.3 release (tag: v0.3)
+
 2013-11-19 15:01:50 +0100  Antonio Ospite  <ospite@studenti.unina.it>
 
-	* kboot-mkconfig: fix a typo (HEAD, master)
+	* kboot-mkconfig: fix a typo (origin/master, origin/HEAD)
 
 2013-11-19 14:57:50 +0100  Antonio Ospite  <ospite@studenti.unina.it>
 
@@ -12,7 +20,7 @@
 
 2011-09-30 23:45:35 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
-	* Release v0.2 as the first actually working release (tag: v0.2, origin/master, origin/HEAD)
+	* Release v0.2 as the first actually working release (tag: v0.2)
 
 2011-09-30 22:49:38 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
diff --git a/Makefile b/Makefile
index 6854d76..7c13e95 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ all:
 clean:
 
 install:
-	install -d $(DESTDIR)$(prefix)/lib/kboot/
-	install -m 0644 kboot-mkconfig_lib $(DESTDIR)$(prefix)/lib/kboot/kboot-mkconfig_lib
+	install -d $(DESTDIR)$(prefix)/share/kboot/
+	install -m 0644 kboot-mkconfig_lib $(DESTDIR)$(prefix)/share/kboot/kboot-mkconfig_lib
 	install -d $(DESTDIR)$(prefix)/sbin
 	install -m 0755 kboot-mkconfig $(DESTDIR)$(prefix)/sbin/kboot-mkconfig
 	install -d $(DESTDIR)$(sysconfdir)/default
diff --git a/kboot-mkconfig b/kboot-mkconfig
index 9d89acf..bf76a4e 100755
--- a/kboot-mkconfig
+++ b/kboot-mkconfig
@@ -20,13 +20,12 @@
 set -e
 
 PACKAGE_NAME=kboot-mkconfig
-PACKAGE_VERSION=0.2
+PACKAGE_VERSION=0.4
 
 prefix=/usr
 exec_prefix=${prefix}
 sbindir=${exec_prefix}/sbin
 bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
 sysconfdir=/etc
 host_os=linux-gnu
 datarootdir=${prefix}/share
@@ -89,7 +88,7 @@ do
     esac
 done
 
-. ${libdir}/kboot/kboot-mkconfig_lib
+. ${datadir}/kboot/kboot-mkconfig_lib
 
 if [ "x$EUID" = "x" ] ; then
   EUID=`id -u`