From 3463ce7c4a87c15a4789d8cc181901202a48ca83 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 10 Aug 2007 08:34:29 +0000 Subject: [PATCH] * config/lyxinclude (LYX_VERSION_SUFFIX): make $with_version available * development/MacOSX/lyxrc.dist.in: use it here instead of program_suffix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19392 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/lyxinclude.m4 | 2 +- development/MacOSX/lyxrc.dist.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index dd8220d6c7..bb1bca12ff 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -35,7 +35,7 @@ AC_ARG_WITH(version-suffix, withval="-"AC_PACKAGE_VERSION ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"` fi - version_suffix=$withval + AC_SUBST(version_suffix,$withval) RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) AC_SUBST(RPM_VERSION_SUFFIX) AC_MSG_RESULT([$withval]) diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in index 670b09e437..44ac366b47 100644 --- a/development/MacOSX/lyxrc.dist.in +++ b/development/MacOSX/lyxrc.dist.in @@ -17,7 +17,7 @@ # \path_prefix "/usr/texbin:/usr/local/gwTeX/bin/powerpc-apple-darwin-current:/usr/local/gwTeX/bin/i386-apple-darwin-current:/usr/local/teTeX/bin/powerpc-apple-darwin-current:/usr/local/teTeX/bin/i386-apple-darwin-current:/sw/bin:/sw/sbin:/opt/local/teTeX/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/usr/sbin:/sbin" -\serverpipe "~/Library/Application Support/LyX@program_suffix@/.lyxpipe" +\serverpipe "~/Library/Application Support/LyX@version_suffix@/.lyxpipe" \preview on # @@ -52,7 +52,7 @@ # FILE SECTION ###################################### # -\template_path "~/Library/Application Support/LyX@program_suffix@/templates" +\template_path "~/Library/Application Support/LyX@version_suffix@/templates" # # PLAIN TEXT EXPORT SECTION ############################## -- 2.39.5