[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60370] trunk/blender: Don' t install LICENSE-bmonofont-i18n.ttf. txt unless international fonts are enabled.

[Shinsuke Irie]

Revision: 60370
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60370
Author:   irie
Date:     2013-09-25 19:18:28 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Don't install LICENSE-bmonofont-i18n.ttf.txt unless international fonts are enabled.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-09-25 17:04:01 UTC (rev 60369)
+++ trunk/blender/SConstruct	2013-09-25 19:18:28 UTC (rev 60370)
@@ -907,9 +907,9 @@
         textlist.append(tp+os.sep+f)
 
 # Font licenses
-textlist += ['release/datafiles/LICENSE-bfont.ttf.txt', 'release/datafiles/LICENSE-bmonofont-i18n.ttf.txt']
+textlist.append('release/datafiles/LICENSE-bfont.ttf.txt')
 if env['WITH_BF_INTERNATIONAL']:
-    textlist.append('release/datafiles/LICENSE-droidsans.ttf.txt')
+    textlist += ['release/datafiles/LICENSE-droidsans.ttf.txt', 'release/datafiles/LICENSE-bmonofont-i18n.ttf.txt']
 
 textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2013-09-25 17:04:01 UTC (rev 60369)
+++ trunk/blender/source/creator/CMakeLists.txt	2013-09-25 19:18:28 UTC (rev 60370)
@@ -235,12 +235,12 @@
 	${CMAKE_SOURCE_DIR}/release/text/copyright.txt
 	${CMAKE_SOURCE_DIR}/release/text/readme.html
 	${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
-	${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 )
 
 if(WITH_INTERNATIONAL)
 	list(APPEND BLENDER_TEXT_FILES
 		${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt
+		${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 	)
 endif()