Re: Master branch partially opened for LyX 2.1.0

[Kornel Benko]

Am Mittwoch, 26. März 2014 um 15:52:49, schrieb Richard Heck <rgh...@lyx.org>
> > I need a one-liner to go into branch 2.1, but not into trunk (== master)
> >
> > So where should it go in? Have I to wait for the branch?
> >
> 
> In principle, that would go into 2.1.1-staging. Please post it.
> 
> Richard

OK.

        Kornel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 023c3e1..037fb4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,8 @@
 
 cmake_minimum_required(VERSION 2.6.4)
 
-set(LYX_PROJECT LyX)
+#needed to distinguish from trunk, so we can install both simultaneously
+set(LYX_PROJECT lyx21)
 
 enable_testing()
 

signature.asc
Description: This is a digitally signed message part.