# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1262462218 0
# Node ID 67dc18294de6a569ee2302690a01bfa16c50d826
# Parent  1981f285f0c072fe2e752affc4488988c1a7ae97
*.sh: Added --force option to python setup.py install call.
upgrade.sh: Removed old cleanup code.

diff -r 1981f285f0c0 -r 67dc18294de6 install.sh
--- a/install.sh	Sat Jan 02 19:37:20 2010 +0000
+++ b/install.sh	Sat Jan 02 19:56:58 2010 +0000
@@ -26,7 +26,7 @@
     exit 1
 fi
 
-python setup.py -q install --prefix ${PREFIX}
+python setup.py -q install --force --prefix ${PREFIX}
 python setup.py clean --all >/dev/null
 
 install -b -m 0600 ${INSTALL_OPTS} vmm.cfg ${PREFIX}/etc/
diff -r 1981f285f0c0 -r 67dc18294de6 upgrade.sh
--- a/upgrade.sh	Sat Jan 02 19:37:20 2010 +0000
+++ b/upgrade.sh	Sat Jan 02 19:56:58 2010 +0000
@@ -43,7 +43,7 @@
     exit 1
 fi
 
-python setup.py -q install --prefix ${PREFIX}
+python setup.py -q install --force --prefix ${PREFIX}
 python setup.py clean --all >/dev/null
 
 install -m 0700 ${INSTALL_OPTS} vmm ${PREFIX}/sbin
@@ -58,14 +58,6 @@
 done
 cd - >/dev/null
 
-# remove misplaced manual pages
-if [ -f /usr/local/share/man/man1/vmm.1 ]; then
-    rm -f /usr/local/share/man/man1/vmm.1
-fi
-if [ -f /usr/local/share/man/man5/vmm.cfg.5 ]; then
-    rm -f /usr/local/share/man/man5/vmm.cfg.5
-fi
-
 # install manual pages
 cd man
 [ -d ${MANDIR}/man1 ] || mkdir -m 0755 -p ${MANDIR}/man1