55 lines
1.6 KiB
Text
55 lines
1.6 KiB
Text
$NetBSD: patch-ad,v 1.9 2006/02/22 00:06:21 rillig Exp $
|
|
|
|
--- install.sh.orig 2001-08-08 02:14:54.000000000 +0200
|
|
+++ install.sh 2006-02-22 00:59:18.000000000 +0100
|
|
@@ -57,7 +57,7 @@ XBINOWNER=root
|
|
XBINGROUP=bin
|
|
ERRFILE=/tmp/xmcd.err
|
|
TMPFILE=/tmp/xmcdinst.$$
|
|
-STARTUP_SCRIPT=.xmcd_start
|
|
+STARTUP_SCRIPT=xmcd_start
|
|
|
|
#
|
|
# Utility functions
|
|
@@ -493,7 +493,7 @@ trap "rm -f $TMPFILE; exit 1" 1 2 3 5 15
|
|
#
|
|
OS_SYS=`(uname -s) 2>/dev/null`
|
|
OS_REL=`(uname -r) 2>/dev/null`
|
|
-OS_MACH=`(uname -m) 2>/dev/null`
|
|
+OS_MACH=@MACHINE_ARCH@
|
|
|
|
if [ -z "$OS_SYS" ]
|
|
then
|
|
@@ -693,7 +693,7 @@ then
|
|
$ECHO "\n\nYou should be the super user to install xmcd."
|
|
|
|
YNDEF=n
|
|
- if [ -z "$BATCH" ] && get_yn "\n Proceed with installation anyway"
|
|
+ if true
|
|
then
|
|
$ECHO "\nWARNING: Without super-user privilege, some files may"
|
|
$ECHO "not be properly installed, or they may be installed"
|
|
@@ -1226,20 +1226,11 @@ do
|
|
done
|
|
|
|
# Configuration files
|
|
-if [ -f $XMCDLIB/config/common.cfg ]
|
|
-then
|
|
- diff $XMCDLIB/config/common.cfg libdi_d/common.cfg >/dev/null 2>&1
|
|
- if [ $? -ne 0 ]
|
|
- then
|
|
- # Save old config file for use by config.sh
|
|
- mv $XMCDLIB/config/common.cfg $XMCDLIB/config/common.cfg.old
|
|
- fi
|
|
-fi
|
|
-inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg \
|
|
+inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg.dist \
|
|
$FILEPERM $OWNER $GROUP
|
|
-inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg \
|
|
+inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg.dist \
|
|
$FILEPERM $OWNER $GROUP
|
|
-inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg \
|
|
+inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg.dist \
|
|
$FILEPERM $OWNER $GROUP
|
|
|
|
rm -f $XMCDLIB/config/.tbl/*
|