ifolder/www-apps/ifolder3-enterprise-plugins/files/3.9.2/use_webbindir_variable_conf...

70 lines
1.6 KiB
Diff

diff -uNr ifolder3-enterprise-plugins-3.9.1.7665.orig/configure.in ifolder3-enterprise-plugins-3.9.1.7665/configure.in
--- ifolder3-enterprise-plugins-3.9.1.7665.orig/configure.in 2013-04-20 03:13:32.779863724 +0200
+++ ifolder3-enterprise-plugins-3.9.1.7665/configure.in 2013-04-20 03:18:23.316231520 +0200
@@ -267,6 +267,30 @@
AC_SUBST(COMMON_DISTCLEAN_FILES)
AC_SUBST(COMMON_MAINTAINER_CLEAN_FILES)
+
+# We have our own "standard" directories for web services.
+#
+webdir="${libexecdir}/web"
+webbindir="${webdir}/bin"
+modulesdir="${webdir}/modules"
+AC_SUBST(webdir)
+AC_SUBST(webbindir)
+AC_SUBST(modulesdir)
+
+
+#
+# Setup standard directories for webaccess app domain
+#
+webaccessdir="${libexecdir}/webaccess"
+AC_SUBST(webaccessdir)
+
+#
+# Setup standard directories for admin app domain
+#
+admindir="${libexecdir}/admin"
+AC_SUBST(admindir)
+
+
#
# Set platform-specific variables
#
@@ -347,7 +371,7 @@
StoreProviderAssembly="SimiasLib.dll"
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7"
- mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe"
+ mappingpath="${webbindir}/Simias.exe"
;;
#
# Windows-specific configuration
@@ -468,25 +492,6 @@
#
-# Setup standard directories for webaccess app domain
-#
-webaccessdir="${libexecdir}/webaccess"
-AC_SUBST(webaccessdir)
-
-#
-# Setup standard directories for admin app domain
-#
-admindir="${libexecdir}/admin"
-AC_SUBST(admindir)
-
-
-#
-# Setup the bootstrapdir
-#
-simiasconfdir="${sysconfdir}/simias"
-AC_SUBST(simiasconfdir)
-
-#
# Setup the bootstrapdir
#
bootstrapdir="${simiasconfdir}/bill"