* MonoDevelop.Autotools.addin.xml, MonoDevelop.Autotools.mdp,

  SimpleProjectMakefileHandler.cs, Handler.cs, SolutionDeployer.cs,
  templates/expansions.m4, templates/configure.template,
  templates/configure.ac.template, Makefile.am: Properly implement
  support for libdir, bindir and datadir in both autotools and simple
  makefiles. Fixes bug #354128.

svn path=/trunk/monodevelop/; revision=93380

3 files changed, 105 insertions, 1 deletions

diff --git a/main/src/addins/MonoDevelop.Autotools/templates/configure.ac.template b/main/src/addins/MonoDevelop.Autotools/templates/configure.ac.template
index 9fe95e253f..625c7c445b 100644
--- a/main/src/addins/MonoDevelop.Autotools/templates/configure.ac.template
+++ b/main/src/addins/MonoDevelop.Autotools/templates/configure.ac.template
@@ -10,6 +10,10 @@ if test "x$PKG_CONFIG" = "xno"; then
         AC_MSG_ERROR([You need to install pkg-config])
 fi
 
+SHAMROCK_EXPAND_LIBDIR
+SHAMROCK_EXPAND_BINDIR
+SHAMROCK_EXPAND_DATADIR
+
 AC_PROG_INSTALL
 
 %%COMPILER_CHECKS%%
diff --git a/main/src/addins/MonoDevelop.Autotools/templates/configure.template b/main/src/addins/MonoDevelop.Autotools/templates/configure.template
index bc52c826d8..8501f2a8de 100644
--- a/main/src/addins/MonoDevelop.Autotools/templates/configure.template
+++ b/main/src/addins/MonoDevelop.Autotools/templates/configure.template
@@ -9,7 +9,14 @@ configurations=%%CONFIGURATIONS%%
 
 usage ()
 {
-	echo "Usage : configure [--prefix=PREFIX] [--config=CONFIG]"
+	echo "Usage : configure [OPTION]... [--config=CONFIG]"
+	echo
+	echo "Options:"
+	echo "  --prefix=PREFIX         install architecture-independent files in PREFIX"
+	echo "                          [/usr/local]"
+	echo "  --bindir=DIR            user executables [PREFIX/bin]"
+	echo "  --datadir=DIR           read-only architecture-independent data [PREFIX/share]"
+	echo "  --libdir=DIR            object code libraries [PREFIX/lib]"
 	echo
 	echo "Configurations available :"
 	for c in $configurations; do
@@ -68,6 +75,27 @@ while test x$1 != x; do
 				shift
 				prefix=$1
 				;;
+		--libdir=*)
+				libdir=`echo $1 | sed 's/--libdir=//'`
+				;;
+		--libdir)
+				shift
+				libdir=$1
+				;;
+		--bindir=*)
+				bindir=`echo $1 | sed 's/--bindir=//'`
+				;;
+		--bindir)
+				shift
+				bindir=$1
+				;;
+		--datadir=*)
+				datadir=`echo $1 | sed 's/--datadir=//'`
+				;;
+		--datadir)
+				shift
+				datadir=$1
+				;;
 		--config=*)
 				conf=`echo $1 | sed 's/--config=//'`
 				validate_config "$conf"
@@ -95,7 +123,20 @@ done
 check_required_packages
 [ $? -eq 1 ] && exit 1
 
+if [ -z "$libdir" ]; then
+	libdir=$prefix/lib
+fi
+if [ -z "$bindir" ]; then
+	bindir=$prefix/bin
+fi
+if [ -z "$datadir" ]; then
+	datadir=$prefix/share
+fi
+
 echo "prefix=$prefix" > config.make
+echo "libdir=$libdir" >> config.make
+echo "bindir=$bindir" >> config.make
+echo "datadir=$datadir" >> config.make
 echo "RUNTIME=mono" >> config.make
 echo "ASSEMBLY_VERSION=$VERSION.0.0" >> config.make
 echo "VERSION=$VERSION" >> config.make
@@ -105,6 +146,15 @@ echo "CONFIG=$config" >> config.make
 echo
 echo "$PACKAGE has been configured with "
 echo "        prefix = $prefix"
+if [ "$libdir" != "$prefix/lib" ]; then
+	echo "        libdir = $libdir"
+fi
+if [ "$bindir" != "$prefix/bin" ]; then
+	echo "        bindir = $bindir"
+fi
+if [ "$datadir" != "$prefix/share" ]; then
+	echo "        datadir = $datadir"
+fi
 echo "        config = $config"
 echo
 
diff --git a/main/src/addins/MonoDevelop.Autotools/templates/expansions.m4 b/main/src/addins/MonoDevelop.Autotools/templates/expansions.m4
new file mode 100644
index 0000000000..ba623565e4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Autotools/templates/expansions.m4
@@ -0,0 +1,50 @@
+AC_DEFUN([SHAMROCK_EXPAND_LIBDIR],
+[	
+	expanded_libdir=`(
+		case $prefix in 
+			NONE) prefix=$ac_default_prefix ;; 
+			*) ;; 
+		esac
+		case $exec_prefix in 
+			NONE) exec_prefix=$prefix ;; 
+			*) ;; 
+		esac
+		eval echo $libdir
+	)`
+	AC_SUBST(expanded_libdir)
+])
+
+AC_DEFUN([SHAMROCK_EXPAND_BINDIR],
+[
+	expanded_bindir=`(
+		case $prefix in 
+			NONE) prefix=$ac_default_prefix ;; 
+			*) ;; 
+		esac
+		case $exec_prefix in 
+			NONE) exec_prefix=$prefix ;; 
+			*) ;; 
+		esac
+		eval echo $bindir
+	)`
+	AC_SUBST(expanded_bindir)
+])
+
+AC_DEFUN([SHAMROCK_EXPAND_DATADIR],
+[
+	case $prefix in
+		NONE) prefix=$ac_default_prefix ;;
+		*) ;;
+	esac
+
+	case $exec_prefix in
+		NONE) exec_prefix=$prefix ;;
+		*) ;;
+	esac
+
+	expanded_datadir=`(eval echo $datadir)`
+	expanded_datadir=`(eval echo $expanded_datadir)`
+
+	AC_SUBST(expanded_datadir)
+])
+