ifolder/www-apps/ifolder3-enterprise/files/3.8.4/use_libdir_for_executables.patch
Mario Fetka 5db653fc3d add ifolder 3.8.4
Package-Manager: portage-2.2.0_alpha166
RepoMan-Options: --force
2013-04-18 20:55:08 +02:00

139 lines
6.2 KiB
Diff

diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-admin-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-admin-setup.in
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-admin-setup.in 2013-04-18 20:17:21.705193758 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-admin-setup.in 2013-04-18 20:29:53.211798633 +0200
@@ -37,29 +37,7 @@
#*******************************************************************************/
-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 "$@"
\ Kein Zeilenumbruch am Dateiende.
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-web-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-web-setup.in
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-web-setup.in 2013-04-18 20:17:21.706193745 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-web-setup.in 2013-04-18 20:28:57.609493757 +0200
@@ -37,31 +37,7 @@
#*******************************************************************************/
-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 "$@"
\ Kein Zeilenumbruch am Dateiende.
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/Makefile.am ifolder3-enterprise-3.8.4.7617/src/server/setup/Makefile.am
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/Makefile.am 2013-04-18 20:17:21.706193745 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/Makefile.am 2013-04-18 20:26:40.950202233 +0200
@@ -158,14 +158,14 @@
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) iFolderProxySetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) CertUpdate.exe $(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)
+ $(INSTALL_PROGRAM) iFolderProxySetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) CertUpdate.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
if WINDOWS
$(INSTALL_PROGRAM) simias-server-setup.cmd $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) ifolder-web-setup.cmd $(DESTDIR)$(bindir)
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/simias-server-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/simias-server-setup.in
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/simias-server-setup.in 2013-04-18 20:17:21.706193745 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/simias-server-setup.in 2013-04-18 20:27:49.542344713 +0200
@@ -36,31 +36,7 @@
#*
#*******************************************************************************/
-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 "$@"
\ Kein Zeilenumbruch am Dateiende.