anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more configure fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9587 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-02-04 09:14:24 +00:00
parent 2df7de8620
commit 8a1867ee65
6 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/ChangeLog
View File

@ -1,3 +1,10 @@
2005-02-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* relyx_configure.in:
* relyx_configure.ac: use AC_CANONICAL_TARGET
* lyxinclude.m4 (LYX_USE_PACKAGING): set libdir correctly
2005-02-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2005-02-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in: * configure.in:

2
config/lyxinclude.m4
View File

@ -675,11 +675,13 @@ case $lyx_use_packaging in
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
default_prefix="/Applications/LyX.app" default_prefix="/Applications/LyX.app"
bindir='${prefix}/Contents/MacOS' bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources' datadir='${prefix}/Contents/Resources'
mandir='${prefix}/Contents/Resources/man' ;; mandir='${prefix}/Contents/Resources/man' ;;
windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout]) 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' bindir='${prefix}/bin'
libdir='${prefix}/Resources'
datadir='${prefix}/Resources' datadir='${prefix}/Resources'
mandir='${prefix}/Resources/man' ;; mandir='${prefix}/Resources/man' ;;
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout]) posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])

1
config/relyx_configure.ac
View File

@ -8,6 +8,7 @@ dnl PACKAGE=reLyX
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_CANONICAL_TARGET
AC_ARG_WITH(version-suffix, AC_ARG_WITH(version-suffix,
[ --with-version-suffix[=<version>] install lyx files as lyx<version>], [ --with-version-suffix[=<version>] install lyx files as lyx<version>],

1
config/relyx_configure.in
View File

@ -8,6 +8,7 @@ dnl PACKAGE=reLyX
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_CANONICAL_TARGET
AC_ARG_WITH(version-suffix, AC_ARG_WITH(version-suffix,
[ --with-version-suffix[=<version>] install lyx files as lyx<version>], [ --with-version-suffix[=<version>] install lyx files as lyx<version>],

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2005-02-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* reLyX/acinclude.m4 (RELYX_USE_PACKAGING): set libdir correctly
2005-02-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2005-02-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.m4: instead of \input-ing the layout files directly in * configure.m4: instead of \input-ing the layout files directly in

2
lib/reLyX/acinclude.m4
View File

@ -126,10 +126,12 @@ AC_MSG_RESULT($lyx_use_packaging)
case $lyx_use_packaging in case $lyx_use_packaging in
macosx) default_prefix="/Applications/LyX.app" macosx) default_prefix="/Applications/LyX.app"
bindir='${prefix}/Contents/MacOS' bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources' datadir='${prefix}/Contents/Resources'
mandir='${prefix}/Contents/Resources/man' ;; mandir='${prefix}/Contents/Resources/man' ;;
windows) default_prefix="C:/Program Files/LyX" windows) default_prefix="C:/Program Files/LyX"
bindir='${prefix}/bin' bindir='${prefix}/bin'
libdir='${prefix}/Resources'
datadir='${prefix}/Resources' datadir='${prefix}/Resources'
mandir='${prefix}/Resources/man' ;; mandir='${prefix}/Resources/man' ;;
posix) default_prefix=$ac_default_prefix ;; posix) default_prefix=$ac_default_prefix ;;