136 lines
5.7 KiB
Diff
136 lines
5.7 KiB
Diff
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/Makefile.am
|
|
===================================================================
|
|
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/Makefile.am 2010-04-15 15:53:17.000000000 +0100
|
|
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/Makefile.am 2010-04-15 16:02:43.000000000 +0100
|
|
@@ -114,12 +114,12 @@
|
|
|
|
install-exec-local: all $(DATA_FILES)
|
|
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) SimiasServerSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) SimiasServerSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) iFolderWebSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) iFolderWebSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) iFolderAdminSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) iFolderAdminSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
+ $(INSTALL_PROGRAM) SimiasServerSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
|
|
+ $(INSTALL_PROGRAM) SimiasServerSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
|
|
+ $(INSTALL_PROGRAM) iFolderWebSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
|
|
+ $(INSTALL_PROGRAM) iFolderWebSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
|
|
+ $(INSTALL_PROGRAM) iFolderAdminSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
|
|
+ $(INSTALL_PROGRAM) iFolderAdminSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
|
|
if WINDOWS
|
|
$(INSTALL_PROGRAM) simias-server-setup.cmd $(DESTDIR)$(bindir)
|
|
$(INSTALL_PROGRAM) ifolder-web-setup.cmd $(DESTDIR)$(bindir)
|
|
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/simias-server-setup.in
|
|
===================================================================
|
|
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/simias-server-setup.in 2010-04-15 15:53:17.000000000 +0100
|
|
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/simias-server-setup.in 2010-04-15 15:59:19.000000000 +0100
|
|
@@ -36,31 +36,8 @@
|
|
#*
|
|
#*******************************************************************************/
|
|
|
|
-OS_ARCH=`uname -m | grep -c x86_64`
|
|
-if [ $OS_ARCH -gt 0 ]
|
|
-then
|
|
- export OS_ARCH=`uname -m`
|
|
-fi
|
|
-
|
|
-rpm -q novell-ifolder-mono > /dev/null 2>&1
|
|
-if [ $? -gt 0 ]
|
|
-then
|
|
-
|
|
- export MONO_PATH=@_webbindir_@:@_bindir_@
|
|
+ export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias
|
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@
|
|
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
|
|
- cd @_bindir_@
|
|
-
|
|
- mono @_bindir_@/SimiasServerSetup.exe "$@"
|
|
-
|
|
-else
|
|
- MONO_RUNTIME_PATH=@_bindir_@/../mono
|
|
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
|
|
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
|
|
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
|
|
- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
|
|
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
|
|
- cd @_bindir_@
|
|
|
|
- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/SimiasServerSetup.exe "$@"
|
|
-fi
|
|
+ mono @_bindir_@/../lib/simias/SimiasServerSetup.exe "$@"
|
|
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-admin-setup.in
|
|
===================================================================
|
|
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/ifolder-admin-setup.in 2010-04-15 15:59:30.000000000 +0100
|
|
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-admin-setup.in 2010-04-15 15:59:56.000000000 +0100
|
|
@@ -37,29 +37,8 @@
|
|
#*******************************************************************************/
|
|
|
|
|
|
-OS_ARCH=`uname -m | grep -c x86_64`
|
|
-if [ $OS_ARCH -gt 0 ]
|
|
-then
|
|
- export OS_ARCH=`uname -m`
|
|
-fi
|
|
-
|
|
-rpm -q novell-ifolder-mono > /dev/null 2>&1
|
|
-if [ $? -gt 0 ]
|
|
-then
|
|
- export MONO_PATH=@_webbindir_@:@_bindir_@
|
|
+ export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias
|
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@
|
|
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
|
|
- cd @_bindir_@
|
|
-
|
|
- mono @_bindir_@/iFolderAdminSetup.exe "$@"
|
|
-else
|
|
- MONO_RUNTIME_PATH=@_bindir_@/../mono
|
|
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
|
|
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
|
|
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
|
|
- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
|
|
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
|
|
- cd @_bindir_@
|
|
|
|
- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderAdminSetup.exe "$@"
|
|
-fi
|
|
+ mono @_bindir_@/../lib/simias/iFolderAdminSetup.exe "$@"
|
|
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-web-setup.in
|
|
===================================================================
|
|
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/ifolder-web-setup.in 2010-04-15 16:00:10.000000000 +0100
|
|
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-web-setup.in 2010-04-15 16:00:34.000000000 +0100
|
|
@@ -37,31 +37,8 @@
|
|
#*******************************************************************************/
|
|
|
|
|
|
-OS_ARCH=`uname -m | grep -c x86_64`
|
|
-if [ $OS_ARCH -gt 0 ]
|
|
-then
|
|
- export OS_ARCH=`uname -m`
|
|
-fi
|
|
-
|
|
-rpm -q novell-ifolder-mono > /dev/null 2>&1
|
|
-if [ $? -gt 0 ]
|
|
-then
|
|
-
|
|
- export MONO_PATH=@_webbindir_@:@_bindir_@
|
|
+ export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias
|
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@
|
|
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
|
|
- cd @_bindir_@
|
|
-
|
|
- mono @_bindir_@/iFolderWebSetup.exe "$@"
|
|
-
|
|
-else
|
|
- MONO_RUNTIME_PATH=@_bindir_@/../mono
|
|
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
|
|
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
|
|
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
|
|
- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
|
|
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
|
|
- cd @_bindir_@
|
|
|
|
- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderWebSetup.exe "$@"
|
|
-fi
|
|
+ mono @_bindir_@/../lib/simias/iFolderWebSetup.exe "$@"
|