anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* config/lyxinclude.m4 (LYX_USE_PACKAGING): define automake conditional

Browse Source 
INSTALL_MACOSX when packaging is macosx.

	* development/Makefile.am: only install MacOSX when needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17988 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-04-25 14:33:54 +00:00
parent 20fa198c28
commit 8d0e191aa3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/lyxinclude.m4
View File

@ -581,6 +581,7 @@ AC_ARG_WITH(packaging,
*) lyx_use_packaging=posix;; *) lyx_use_packaging=posix;;
esac]) esac])
AC_MSG_RESULT($lyx_use_packaging) AC_MSG_RESULT($lyx_use_packaging)
lyx_install_macosx=false
case $lyx_use_packaging in 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])
PACKAGE=LyX${version_suffix} PACKAGE=LyX${version_suffix}
@ -589,7 +590,8 @@ case $lyx_use_packaging in
libdir='${prefix}/Contents/Resources' libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources' datadir='${prefix}/Contents/Resources'
pkgdatadir='${datadir}' pkgdatadir='${datadir}'
mandir='${datadir}/man' ;; mandir='${datadir}/man'
lyx_install_macosx=false ;;
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])
PACKAGE=LyX${version_suffix} PACKAGE=LyX${version_suffix}
default_prefix="C:/Program Files/${PACKAGE}" default_prefix="C:/Program Files/${PACKAGE}"
@ -605,6 +607,7 @@ case $lyx_use_packaging in
default_prefix=$ac_default_prefix ;; default_prefix=$ac_default_prefix ;;
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
esac esac
AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
AC_SUBST(pkgdatadir) AC_SUBST(pkgdatadir)
AC_SUBST(program_suffix) AC_SUBST(program_suffix)
]) ])

2
development/Makefile.am
View File

@ -1,6 +1,8 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
if INSTALL_MACOSX
SUBDIRS = MacOSX SUBDIRS = MacOSX
endif
EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \ EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \
gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \ gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \