Commit yaboot 1.3.2

[yaboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 94ce349fa135672a1b974800fea54fabf6abc9a0..9a10eed581b3f2c4fc1654f1a11b0b7efca6af66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ## Configuration section
 
-VERSION = 1.3
+VERSION = 1.3.2
 # Debug mode (verbose)
 DEBUG = 0
 ROOT =
@@ -124,6 +124,8 @@ bindist: all
        mkdir -p -m 755 ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot
        cp -a COPYING ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/COPYING
        cp -a README ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/README
+       mv ../yaboot-binary-${VERSION}/etc/yaboot.conf ../yaboot-binary-${VERSION}/usr/local/share/doc/
+       rmdir ../yaboot-binary-${VERSION}/etc
        ${GETROOT} tar -C ../yaboot-binary-${VERSION} -zcvpf ../yaboot-binary-${VERSION}.tar.gz .
        rm -rf ../yaboot-binary-${VERSION}
 
@@ -132,16 +134,19 @@ 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 .
        chmod a-w COPYING
 
-install: all
-       @strip second/yaboot
-       @strip --remove-section=.comment second/yaboot
-       @strip util/addnote
-       @strip --remove-section=.comment --remove-section=.note util/addnote
+strip: all
+       strip second/yaboot
+       strip --remove-section=.comment second/yaboot
+       strip util/addnote
+       strip --remove-section=.comment --remove-section=.note util/addnote
+
+install: all strip
        install -d -o root -g root -m 0755 ${ROOT}/etc/
        install -d -o root -g root -m 0755 ${ROOT}/${PREFIX}/sbin/
        install -d -o root -g root -m 0755 ${ROOT}/${PREFIX}/lib
@@ -165,7 +170,12 @@ install: all
        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