From: Antonio Ospite <ospite@studenti.unina.it>
Date: Tue, 19 Nov 2013 14:11:55 +0000 (+0100)
Subject: Merge tag 'v0.3' into debian
X-Git-Tag: debian/0.4-1~5
X-Git-Url: https://git.ao2.it/kboot-utils.git/commitdiff_plain/7f33597382d7c93110b39a882fb8e39ff3fc4872?hp=c6fbf26a890ae9cdc955c1c01fed16aeb6dc8f28

Merge tag 'v0.3' into debian

Release v0.3
---

diff --git a/ChangeLog b/ChangeLog
index e4455ce..bb12e0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,26 @@
+2013-11-19 15:01:50 +0100  Antonio Ospite  <ospite@studenti.unina.it>
+
+	* kboot-mkconfig: fix a typo (HEAD, master)
+
+2013-11-19 14:57:50 +0100  Antonio Ospite  <ospite@studenti.unina.it>
+
+	* Makefile: fix directory creation
+
+2013-11-19 14:04:31 +0100  Antonio Ospite  <ospite@studenti.unina.it>
+
+	* README: strip trailing spaces
+
 2011-09-30 23:45:35 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
-	* Release v0.2 as the first actually working release (HEAD, v0.2, master)
+	* Release v0.2 as the first actually working release (tag: v0.2, origin/master, origin/HEAD)
 
 2011-09-30 22:49:38 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
-	* Fix several problems in linux_find_root_device (origin/master, origin/HEAD)
+	* Fix several problems in linux_find_root_device
 
 2011-09-23 13:27:44 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
-	* Release a new version with a ChangeLog file (v0.1a)
+	* Release a new version with a ChangeLog file (tag: v0.1a)
 
 2011-09-23 13:14:41 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
@@ -20,7 +32,7 @@
 
 2011-09-22 13:03:09 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
-	* Remove the debian/ dir from the master branch (v0.1)
+	* Remove the debian/ dir from the master branch (tag: v0.1)
 
 2011-09-13 15:16:38 +0200  Antonio Ospite  <ospite@studenti.unina.it>
 
diff --git a/Makefile b/Makefile
index 66607ac..6854d76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,16 @@
-PREFIX     ?= /usr
-SYSCONFDIR ?= /etc
+prefix     ?= /usr
+sysconfdir ?= /etc
 
 all:
+clean:
 
 install:
-	echo ${DESTDIR}
-	install -m 0755 -d $(DESTDIR)$(PREFIX)/lib/kboot/
-	install -m 0644 kboot-mkconfig_lib $(DESTDIR)$(PREFIX)/lib/kboot/kboot-mkconfig_lib
-	install -m 0755 kboot-mkconfig $(DESTDIR)$(PREFIX)/sbin/kboot-mkconfig
-	install -m 0644 default.kboot $(DESTDIR)$(SYSCONFDIR)/default/kboot
+	install -d $(DESTDIR)$(prefix)/lib/kboot/
+	install -m 0644 kboot-mkconfig_lib $(DESTDIR)$(prefix)/lib/kboot/kboot-mkconfig_lib
+	install -d $(DESTDIR)$(prefix)/sbin
+	install -m 0755 kboot-mkconfig $(DESTDIR)$(prefix)/sbin/kboot-mkconfig
+	install -d $(DESTDIR)$(sysconfdir)/default
+	install -m 0644 default.kboot $(DESTDIR)$(sysconfdir)/default/kboot
 
 changelog:
 	git log --pretty="format:%ai  %aN  <%aE>%n%n%x09* %s%d%n" > ChangeLog
diff --git a/README b/README
index 203c4e7..b309005 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
-kboot-utils provides helper tools to automatically generate a kboot.conf file 
+kboot-utils provides helper tools to automatically generate a kboot.conf file
 from entries in /boot.
 
-kboot.conf is used for instance by the petitboot bootloader, which is used on 
-the Sony PlayStation 3 in OtherOS mode; petitboot reads the file from the root 
+kboot.conf is used for instance by the petitboot bootloader, which is used on
+the Sony PlayStation 3 in OtherOS mode; petitboot reads the file from the root
 filesystem in order to list kernels to boot.
 
 A description of the kboot.conf file format can be found at:
diff --git a/kboot-mkconfig b/kboot-mkconfig
index fdc7a59..9d89acf 100755
--- a/kboot-mkconfig
+++ b/kboot-mkconfig
@@ -2,7 +2,7 @@
 # Generate kboot.conf by inspecting /boot contents.
 # Copyright (C) 2011  Antonio Ospite <ospite@studenti.unina.it>
 #
-# Inspired by kboot-mkconfig
+# Inspired by grub-mkconfig
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by