Commit yaboot 1.3.2

Commit yaboot 1.3.2.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-3

diff --git a/ChangeLog b/ChangeLog
index 25a56d42aa39ca891255eb0711cc49b5d3e3fcea..48fdfd54dcf99abfca902fa8cc1bd77051b746e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
 # 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:
 2002-03-25 14:05:52 GMT        Ethan Benson <erbenson@alaska.net>      patch-2
 
     Summary:

diff --git a/Makefile b/Makefile
index 7e547ec0d2443ed2b32b4c9e1c8da6a56556f1f6..9a10eed581b3f2c4fc1654f1a11b0b7efca6af66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ## Configuration section
 
 ## Configuration section
 

-VERSION = 1.3.1
+VERSION = 1.3.2

 # Debug mode (verbose)
 DEBUG = 0
 ROOT =
 # 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
        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 .
        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
        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
        @echo
        @echo "Installation successful."
        @echo

diff --git a/changelog b/changelog
index 7b393232c50dc2ab031cc10524f79a5975c51371..f091b87338f6e272a12f20af03b36eea780d3c1e 100644 (file)
--- 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
 2001-09-20  Ethan Benson  <erbenson@alaska.net>
 
        * Version 1.3.1

diff --git a/ybin/ybin b/ybin/ybin
index 834e6ae6e518352a8b8226371f1b40adc9d798d1..a7e790d3dc346f6c494a667558b4d28712b85454 100755 (executable)
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -28,7 +28,7 @@ if [ -n "$PATH_PREFIX" ] ; then
 fi
 PRG="${0##*/}"
 SIGINT="$PRG: Interrupt caught ... exiting"
 fi
 PRG="${0##*/}"
 SIGINT="$PRG: Interrupt caught ... exiting"

-VERSION=1.3.1
+VERSION=1.3.2

 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"