>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
Angus> Ok, I tried out the patch. In fact, it does not address the Angus> problem above. Did you run autogen.sh? I am surprised that this problem is still present (note the added RELYX_USE_PACKAGING). Anyway, here is the same patch for 1.4.0cvs, which I intend to apply, since I did apply the 1.3.x version. JMarc
Index: ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v retrieving revision 1.995 diff -u -p -r1.995 ChangeLog --- ChangeLog 2 Feb 2005 13:15:54 -0000 1.995 +++ ChangeLog 2 Feb 2005 13:38:02 -0000 @@ -1,5 +1,8 @@ 2005-02-02 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> + * configure.ac: if the prefix contains space, replace it with + ${builddir}/installprefix and issue a warning. + * configure.ac: when testing for AikSaurus, do not require libbz2. 2005-01-27 Lars Gullik Bjonnes <[EMAIL PROTECTED]> Index: configure.ac =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v retrieving revision 1.42 diff -u -p -r1.42 configure.ac --- configure.ac 2 Feb 2005 13:17:23 -0000 1.42 +++ configure.ac 2 Feb 2005 13:38:02 -0000 @@ -229,6 +229,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 Index: config/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v retrieving revision 1.153 diff -u -p -r1.153 ChangeLog --- config/ChangeLog 20 Jan 2005 14:44:19 -0000 1.153 +++ config/ChangeLog 2 Feb 2005 13:38:02 -0000 @@ -1,3 +1,8 @@ +2005-02-02 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> + + * lyxinclude.m4 (LYX_USE_PACKAGING): remove single quotes around + prefix in the windows case. + 2005-01-20 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> * common.am (pch-file): new target, used recursively by target Index: config/lyxinclude.m4 =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v retrieving revision 1.106 diff -u -p -r1.106 lyxinclude.m4 --- config/lyxinclude.m4 12 Jan 2005 17:01:35 -0000 1.106 +++ config/lyxinclude.m4 2 Feb 2005 13:38:02 -0000 @@ -571,7 +571,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' ;; Index: lib/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v retrieving revision 1.668 diff -u -p -r1.668 ChangeLog --- lib/ChangeLog 24 Jan 2005 17:12:15 -0000 1.668 +++ lib/ChangeLog 2 Feb 2005 13:38:04 -0000 @@ -1,3 +1,10 @@ +2005-02-02 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> + + * reLyX/configure.ac: use RELYX_USE_PACKAGING as in main configure. + + * reLyX/acinclude.m4 (RELYX_ERROR, RELYX_USE_PACKAGING): new + macros. + 2005-01-15 Georg Baum <[EMAIL PROTECTED]> * ui/classic.ui, ui/stdmenus.ui: add output-changes. Index: lib/reLyX/acinclude.m4 =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/acinclude.m4,v retrieving revision 1.5 diff -u -p -r1.5 acinclude.m4 --- lib/reLyX/acinclude.m4 25 May 2004 14:42:10 -0000 1.5 +++ lib/reLyX/acinclude.m4 2 Feb 2005 13:38:04 -0000 @@ -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 @@ -99,3 +108,32 @@ $relyx_warning_txt 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 +]) Index: lib/reLyX/configure.ac =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/configure.ac,v retrieving revision 1.3 diff -u -p -r1.3 configure.ac --- lib/reLyX/configure.ac 24 Jan 2005 11:05:55 -0000 1.3 +++ lib/reLyX/configure.ac 2 Feb 2005 13:38:04 -0000 @@ -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}\"\`"`