better code when prefix contains a space

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9570 a592a061-630c-0410-9148-cb99ea01b6c8

config/ChangeLog

@@ -1,3 +1,15 @@
+2005-01-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* relyx_configure.in: 
+	* relyx_configure.ac: use RELYX_USE_PACKAGING as in main configure.
+
+	* lyxinclude.m4 (LYX_USE_PACKAGING): remove single quotes around
+	prefix in the windows case.
+
+	* configure.in:
+	* configure.ac: if the prefix contains space, replace it with
+	${builddir}/installprefix and issue a warning.
+
 2005-01-24  Angus Leeming  <leeming@lyx.org>
 
 	* relyx_configure.{ac,in}: revert Jean-Marc's wrapping of the

config/configure.ac

@@ -210,6 +210,14 @@ LYX_USE_PACKAGING
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
+  LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+   causes problems with the Makefiles. The installation will be done in 
+   directory \"`pwd`/installprefix\" instead. Please move its contents to
+   the right place after installation.])
+  prefix=`pwd`/installprefix
+fi
+
 
 ### Setup GNU gettext
 dnl GNU gettext is written in C

config/configure.in

@@ -217,6 +217,13 @@ LYX_USE_PACKAGING
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
+  LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+   causes problems with the Makefiles. The installation will be done in 
+   directory \"`pwd`/installprefix\" instead. Please move its contents to
+   the right place after installation.])
+  prefix=`pwd`/installprefix
+fi
 
 ### Setup GNU gettext
 dnl GNU gettext is written in C

config/lyxinclude.m4

@@ -678,7 +678,7 @@ case $lyx_use_packaging in
 	   datadir='${prefix}/Contents/Resources'
 	   mandir='${prefix}/Contents/Resources/man' ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout]) 
-           default_prefix="'C:/Program Files/LyX'"
+           default_prefix="C:/Program Files/LyX"
 	   bindir='${prefix}/bin'
 	   datadir='${prefix}/Resources'
 	   mandir='${prefix}/Resources/man' ;;

config/relyx_configure.ac

@@ -21,9 +21,19 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # if reLyX has already been generated in this directory, delete it first
 test -x reLyX && rm -f reLyX
+
+### Check how the files should be packaged
+RELYX_USE_PACKAGING
 # fix the value of the prefixes.
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
+  RELYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+   causes problems with the Makefiles. The installation will be done in 
+   directory \"`pwd`/installprefix\" instead. Please move its contents to
+   the right place after installation.])
+  prefix=`pwd`/installprefix
+fi
 
 # we need to expand ${datadir} to put it into the reLyX wrapper.
 LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`

config/relyx_configure.in

@@ -21,9 +21,19 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # if reLyX has already been generated in this directory, delete it first
 test -x reLyX && rm -f reLyX
+
+### Check how the files should be packaged
+RELYX_USE_PACKAGING
 # fix the value of the prefixes.
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
+  RELYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+   causes problems with the Makefiles. The installation will be done in 
+   directory \"`pwd`/installprefix\" instead. Please move its contents to
+   the right place after installation.])
+  prefix=`pwd`/installprefix
+fi
 
 # we need to expand ${datadir} to put it into the reLyX wrapper.
 LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`

lib/ChangeLog

@@ -1,3 +1,8 @@
+2005-01-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* reLyX/acinclude.m4 (RELYX_ERROR, RELYX_USE_PACKAGING): new
+	macros. 
+
 2005-01-20  Angus Leeming  <leeming@lyx.org>
 
 	* configure.m4: Invoke scripts as "python $$s/scripts/foo.py", etc.

lib/reLyX/acinclude.m4

@@ -7,6 +7,15 @@ relyx_warning_txt="$relyx_warning_txt
 relyx_warning=yes])
 
 
+dnl Usage: RELYX_ERROR(message)  Displays the error "message" and sets
+dnl the flag lyx_error to yes.
+AC_DEFUN([RELYX_ERROR],[
+relyx_error_txt="$relyx_error_txt
+== $1
+"
+relyx_error=yes])
+
+
 dnl RELYX_SEARCH_PROG(VARIABLE-NAME,PROGRAMS-LIST,ACTION-IF-FOUND)
 dnl             
 define(RELYX_SEARCH_PROG,[dnl
@@ -100,3 +109,30 @@ EOF
 fi
 fi])
 
+dnl Check what kind of packaging should be used at install time. 
+dnl The default is autodetected. 
+AC_DEFUN([RELYX_USE_PACKAGING],
+[AC_MSG_CHECKING([what packaging should be used])
+AC_ARG_WITH(packaging,
+  [  --with-packaging=THIS   Use THIS packaging for installation:
+			    Possible values: posix, windows, macosx],
+  [lyx_use_packaging="$withval"], [
+  case $host in
+    *-apple-darwin*) lyx_use_packaging=macosx ;;
+     *-pc-mingw32*) lyx_use_packaging=windows;;
+                  *) lyx_use_packaging=posix;;
+  esac])
+AC_MSG_RESULT($lyx_use_packaging)
+case $lyx_use_packaging in 
+   macosx) default_prefix="/Applications/LyX.app"
+	   bindir='${prefix}/Contents/MacOS'
+	   datadir='${prefix}/Contents/Resources'
+	   mandir='${prefix}/Contents/Resources/man' ;;
+  windows) default_prefix="C:/Program Files/LyX"
+	   bindir='${prefix}/bin'
+	   datadir='${prefix}/Resources'
+	   mandir='${prefix}/Resources/man' ;;
+    posix) default_prefix=$ac_default_prefix ;;
+    *) RELYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
+esac
+])