1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00

Provide support for installation under OpenBSD. Don't override PATH in the install script, it may hide needed tools, and the location of these binaries is highly OS-dependent anyway.

Also, allow overriding some variables in the install script.
This commit is contained in:
Pascal Stumpf 2012-08-09 21:57:47 +02:00 committed by Jon Trulson
parent f9c844aada
commit 6fc45220c4
5 changed files with 115 additions and 6 deletions

View file

@ -207,6 +207,9 @@ CleanDaemons()
then then
stopsrc -s inetd >>$LOGFILE 2>&1 stopsrc -s inetd >>$LOGFILE 2>&1
fi fi
elif [ "$PLATFORM" = openbsd ]
then
true
else else
ps -ef | grep $i | grep -v grep >/tmp/tmppsout ps -ef | grep $i | grep -v grep >/tmp/tmppsout
if [ -s /tmp/tmppsout ] if [ -s /tmp/tmppsout ]
@ -234,6 +237,9 @@ RestartInetd()
elif [ "$PLATFORM" = "dec" ] elif [ "$PLATFORM" = "dec" ]
then then
/usr/sbin/inetd /usr/sbin/inetd
elif [ "$PLATFORM" = "openbsd" ]
then
true
else else
#ifdef hpV4 #ifdef hpV4
/usr/sbin/inetd /usr/sbin/inetd
@ -537,6 +543,10 @@ XCOMM
then then
PLATFORM="linux" PLATFORM="linux"
PLATFORM_SCRIPT_DIR="" PLATFORM_SCRIPT_DIR=""
elif [ $BUILDSYSTEM = "OpenBSD" ];
then
PLATFORM="openbsd"
PLATFORM_SCRIPT_DIR=""
else # Build system = HP else # Build system = HP
PLATFORM=hp-ux PLATFORM=hp-ux
PLATFORM_SCRIPT_DIR=hp PLATFORM_SCRIPT_DIR=hp
@ -566,9 +576,6 @@ XCOMM
unset TMPDIR unset TMPDIR
PATH=/bin:/usr/bin:/etc:/usr/bin/X11:
export PATH
CLEANING="no" CLEANING="no"
CLEANING_ETC="no" CLEANING_ETC="no"
TARBALL="no" TARBALL="no"
@ -872,9 +879,9 @@ XCOMM
fi fi
fi fi
INSTALL_LOCATION=CDE_INSTALLATION_TOP [ -z "$INSTALL_LOCATION" ] && INSTALL_LOCATION=CDE_INSTALLATION_TOP
CONFIGURE_LOCATION=CDE_CONFIGURATION_TOP [ -z "$CONFIGURE_LOCATION" ] && CONFIGURE_LOCATION=CDE_CONFIGURATION_TOP
LOGFILES_LOCATION=CDE_LOGFILES_TOP [ -z "$LOGFILES_LOCATION" ] && LOGFILES_LOCATION=CDE_LOGFILES_TOP
if [ -L $INSTALL_LOCATION -a "$CONFIGURE_ONLY" != "yes" ] if [ -L $INSTALL_LOCATION -a "$CONFIGURE_ONLY" != "yes" ]
then then

View file

@ -19,6 +19,9 @@ PLATFORM = hp-ux
PLATFORM = linux PLATFORM = linux
SUBDIRS = linux SUBDIRS = linux
#endif #endif
#ifdef OpenBSDArchitecture
PLATFORM = openbsd
#endif
#ifdef RsArchitecture #ifdef RsArchitecture
PLATFORM = aix PLATFORM = aix
SUBDIRS = ibm SUBDIRS = ibm

View file

@ -1067,3 +1067,27 @@ programs/fontaliases/postscript/ja/prolog.ps
#{ dec #{ dec
# install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps # install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps
#} #}
#
# for OpenBSD
#
programs/fontaliases/linux/C/fonts.alias
{ openbsd
install_target = /usr/local/dt/config/xfonts/C/fonts.alias
}
#
programs/fontaliases/linux/C/fonts.dir
{ openbsd
install_target = /usr/local/dt/config/xfonts/C/fonts.dir
}
#
programs/fontaliases/linux/ja_JP/fonts.alias
{ openbsd
install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.alias
}
#
programs/fontaliases/linux/ja_JP/fonts.dir
{ openbsd
install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.dir
}

View file

@ -1223,3 +1223,75 @@ XCOMM
install_target = /usr/shlib/libDtMmdb.so install_target = /usr/shlib/libDtMmdb.so
type = sym_link type = sym_link
} }
XCOMM
XCOMM
XCOMM >>-----------------------------
XCOMM openbsd libraries
XCOMM <<-----------------------------
XCOMM
XCOMM
lib/DtHelp/libDtHelp.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtHelp.so.0.0
mode = 0755
}
XCOMM
lib/DtPrint/libDtPrint.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtPrint.so.0.0
mode = 0755
}
XCOMM
lib/DtMrm/libDtMrm.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtMrm.so.0.0
mode = 0755
}
XCOMM
lib/DtSvc/libDtSvc.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtSvc.so.0.0
mode = 0755
}
XCOMM
lib/DtWidget/libDtWidget.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtWidget.so.0.0
mode = 0755
}
XCOMM
lib/DtTerm/libDtTerm.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtTerm.so.0.0
mode = 0755
}
XCOMM
lib/tt/lib/libtt.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libtt.so.0.0
mode = 0755
}
XCOMM
lib/csa/libcsa.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libcsa.so.0.0
mode = 0755
}
XCOMM
lib/DtSearch/libDtSearch.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtSearch.so.0.0
mode = 0755
}
#if 0 /* JET - not for openbsd (yet) */
XCOMM
lib/DtMmdb/libDtMmdb.so.0.0
{ openbsd
install_target = /usr/local/dt/lib/libDtMmdb.so.0.0
mode = 0755
}
XCOMM
#endif

View file

@ -27,6 +27,9 @@ UDB_RELEASE_OPT = -ReleaseStream uxp
#ifdef LinuxArchitecture #ifdef LinuxArchitecture
UDB_RELEASE_OPT = -ReleaseStream linux UDB_RELEASE_OPT = -ReleaseStream linux
#endif #endif
#ifdef OpenBSDArchitecture
UDB_RELEASE_OPT = -ReleaseStream openbsd
#endif
/* /*
* Insure that symbols used in the .udb files are undefined for * Insure that symbols used in the .udb files are undefined for