some trivial fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9468 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index c37d347fbcd44e649411fefb0d084bd938d72725..aee6083d6996e4bac9334453409d30871be52731 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * configure.ac: remove duplicated code
+
 2005-01-06  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * configure.ac: use LYX_USE_PACKAGING

diff --git a/config/ChangeLog b/config/ChangeLog
index a13821f4499b6c91e202620ad264edaf52fb58e2..e0cc62cd33c83d991d9f279bef9e856e6403c11e 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxinclude.m4: fix default win32 prefix
+
 2005-01-06  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * lyxinclude.m4 (LYX_USE_PACKAGING): new macro.

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index eb2aa64ecccaeaded2df34f38162d29813f5566f..74ee91d050be08bc6a6517a14efea77a51748b05 100644 (file)
--- 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 a8a2ffafde8c2fcaaa4790fa94c29e44f5c10104..62c9db99ae756ff214d9887a8a499f9d9d4446de 100644 (file)
--- 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 8437f28f4f45126e8de7c4aed30e84f4450dc030..2db09aee4bb36216210ba4229e87cdac29cfe089 100644 (file)
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * Spacing.h: remove unused parameters
+
 2005-01-10  Angus Leeming  <leeming@lyx.org>
 
        * 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 fb27db284ac992f11c0e60f19fd58cb80659e2f8..a83ca24756c263023b15829c61043917f163c3c8 100644 (file)
--- 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