git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1384 d1b88da0-ebda-0310...

diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper
index 68530bac4725f40c49327a9d3a82f5943ec312bc..bd89e6d7a05fef8ebf0feb8f55316997bb3547e3 100755 (executable)
--- a/Scripts/sogod-wrapper
+++ b/Scripts/sogod-wrapper
@@ -46,6 +46,8 @@ elif [ -f $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then
     sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9"
 elif [ -f $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 ]; then
     sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9"
+elif [ -f $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9 ]; then
+    sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9"
 else
     echo "Can't find sogod-0.9"
     exit 1

diff --git a/configure b/configure
index a56a427891e011265fb6f289045772b3ec25da2d..eeb6af4411d47098d70948502444cf781d2a490a 100755 (executable)
--- a/configure
+++ b/configure
@@ -303,16 +303,16 @@ genConfigMake() {
   else
     cfgwrite "# configured for GNUstep install"
     cfgwrite ""
-    cfgwrite "SOGO_SYSLIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARIES}"
-    cfgwrite "SOGO_LIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
+    cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_LIBRARIES}"
+    cfgwrite "SOGO_LIBDIR=\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
     cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
     cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
-    cfgwrite "SOGO_TOOLS=\${DESTDIR}/\${GNUSTEP_TOOLS}"
-    cfgwrite "SOGO_ADMIN_TOOLS=\${DESTDIR}/\${GNUSTEP_ADMIN_TOOLS}"
-    cfgwrite "SOPE_SAXMAPPINGS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxMappings"
-    cfgwrite "SOPE_SAXDRIVERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
-    cfgwrite "SOPE_WOXBUILDERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
-    cfgwrite "SOGO_TYPEMODELS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/OCSTypeModels"
+    cfgwrite "SOGO_TOOLS=\${GNUSTEP_TOOLS}"
+    cfgwrite "SOGO_ADMIN_TOOLS=\${GNUSTEP_ADMIN_TOOLS}"
+    cfgwrite "SOPE_SAXMAPPINGS=\${GNUSTEP_LIBRARY}/SaxMappings"
+    cfgwrite "SOPE_SAXDRIVERS=\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+    cfgwrite "SOPE_WOXBUILDERS=\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+    cfgwrite "SOGO_TYPEMODELS=\${GNUSTEP_LIBRARY}/OCSTypeModels"
   fi
 
   if test $ARG_WITH_STRIP = 1; then