From 77fdc2f3052a361f87cde5861eb8e64bf9f35918 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 12 Jan 2005 17:01:35 +0000 Subject: [PATCH] some trivial fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9468 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ config/ChangeLog | 4 ++++ config/lyxinclude.m4 | 2 +- configure.ac | 4 ---- src/tex2lyx/ChangeLog | 4 ++++ src/tex2lyx/Spacing.h | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c37d347fbc..aee6083d69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-12 Jean-Marc Lasgouttes + + * configure.ac: remove duplicated code + 2005-01-06 Jean-Marc Lasgouttes * configure.ac: use LYX_USE_PACKAGING diff --git a/config/ChangeLog b/config/ChangeLog index a13821f449..e0cc62cd33 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2005-01-12 Jean-Marc Lasgouttes + + * lyxinclude.m4: fix default win32 prefix + 2005-01-06 Jean-Marc Lasgouttes * lyxinclude.m4 (LYX_USE_PACKAGING): new macro. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index eb2aa64ecc..74ee91d050 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -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' ;; diff --git a/configure.ac b/configure.ac index a8a2ffafde..62c9db99ae 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,6 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION) # This is needed by GNU gettext ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa" -# fix the value of the prefixes. -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ### Set the execute permissions of the various scripts correctly for file in config/install-sh config/mkinstalldirs lib/configure ; do chmod 755 ${srcdir}/${file} diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog index 8437f28f4f..2db09aee4b 100644 --- a/src/tex2lyx/ChangeLog +++ b/src/tex2lyx/ChangeLog @@ -1,3 +1,7 @@ +2005-01-11 Jean-Marc Lasgouttes + + * Spacing.h: remove unused parameters + 2005-01-10 Angus Leeming * tex2lyx.C: use support/package.h to provide the paths to the diff --git a/src/tex2lyx/Spacing.h b/src/tex2lyx/Spacing.h index fb27db284a..a83ca24756 100644 --- a/src/tex2lyx/Spacing.h +++ b/src/tex2lyx/Spacing.h @@ -31,7 +31,7 @@ public: /// void set(Spacing::Space, float = 1.0) {} /// - void set(Spacing::Space sp, std::string const & val) {} + void set(Spacing::Space, std::string const &) {} }; #endif // NOT SPACING_H