From 103d77e0ce929f3f57b2b75bc38e92b9c2d973c3 Mon Sep 17 00:00:00 2001
From: Ethan Benson <erbenson@alaska.net>
Date: Mon, 25 Mar 2002 14:28:05 +0000
Subject: [PATCH] Commit yaboot 1.3.2

Commit yaboot 1.3.2.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-3
---
 ChangeLog | 13 +++++++++++++
 Makefile  | 10 ++++++++--
 changelog |  7 +++++++
 ybin/ybin |  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25a56d4..48fdfd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2002-03-25 14:28:05 GMT	Ethan Benson <erbenson@alaska.net>	patch-3
+
+    Summary:
+      Commit yaboot 1.3.2
+    Revision:
+      yaboot--devel--1.3--patch-3
+
+    Commit yaboot 1.3.2.
+
+    modified files:
+     ChangeLog Makefile changelog ybin/ybin
+
+
 2002-03-25 14:05:52 GMT	Ethan Benson <erbenson@alaska.net>	patch-2
 
     Summary:
diff --git a/Makefile b/Makefile
index 7e547ec..9a10eed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ## Configuration section
 
-VERSION = 1.3.1
+VERSION = 1.3.2
 # Debug mode (verbose)
 DEBUG = 0
 ROOT =
@@ -134,6 +134,7 @@ clean:
 	find . -name '#*' | xargs rm -f
 	find . -name '.#*' | xargs rm -f
 	find . -name '*~' | xargs rm -f
+	-gunzip man/*.gz
 	rm -rf man.deb
 	chmod 755 ybin/ybin ybin/ofpath ybin/yabootconfig
 	chmod -R u+rwX,go=rX .
@@ -169,7 +170,12 @@ install: all strip
 	install -o root -g root -m 0644 man/ybin.8.gz ${ROOT}/${PREFIX}/${MANDIR}/man8/ybin.8.gz
 	install -o root -g root -m 0644 man/yaboot.conf.5.gz ${ROOT}/${PREFIX}/${MANDIR}/man5/yaboot.conf.5.gz
 	@gunzip man/*.gz
-	@[ ! -e ${ROOT}/etc/yaboot.conf ] && install -o root -g root -m 0644 etc/yaboot.conf ${ROOT}/etc/yaboot.conf
+	@if [ ! -e ${ROOT}/etc/yaboot.conf ] ; then						\
+		echo "install -o root -g root -m 0644 etc/yaboot.conf ${ROOT}/etc/yaboot.conf"; \
+		install -o root -g root -m 0644 etc/yaboot.conf ${ROOT}/etc/yaboot.conf;	\
+	 else											\
+		echo "/etc/yaboot.conf already exists, leaving it alone";			\
+	 fi
 	@echo
 	@echo "Installation successful."
 	@echo
diff --git a/changelog b/changelog
index 7b39323..f091b87 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+2001-09-24  Ethan Benson  <erbenson@alaska.net>
+
+	* Version 1.3.2
+
+	* Fix Makefile thinko where make install failed if
+	  /etc/yaboot.conf already existed.
+
 2001-09-20  Ethan Benson  <erbenson@alaska.net>
 
 	* Version 1.3.1
diff --git a/ybin/ybin b/ybin/ybin
index 834e6ae..a7e790d 100755
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -28,7 +28,7 @@ if [ -n "$PATH_PREFIX" ] ; then
 fi
 PRG="${0##*/}"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.1
+VERSION=1.3.2
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"
-- 
2.39.2