r17500 by craig - Per Gentoo's app-office/scribus/scribus-1.4.9999.ebuild, add in WANT_NOTEMPLATES for those that don't want to install templates, WANT_NOEXAMPLES to not install script samples (CMake options), only install README.MacOSX for OSX installs

scribus-commit scribus-commit at lists.scribus.net
Sun May 6 21:09:13 UTC 2012


Author: craig
Date: Sun May  6 21:09:13 2012
New Revision: 17500

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17500
Log:
Per Gentoo's app-office/scribus/scribus-1.4.9999.ebuild, add in WANT_NOTEMPLATES for those that don't want to install templates, WANT_NOEXAMPLES to not install script samples (CMake options), only install README.MacOSX for OSX installs

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/resources/templates/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17500&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun May  6 21:09:13 2012
@@ -862,7 +862,6 @@
 ADD_SUBDIRECTORY(resources/profiles)
 ADD_SUBDIRECTORY(resources/swatches)
 ADD_SUBDIRECTORY(resources/templates)
-#ADD_SUBDIRECTORY(resources/translations/qm)
 ADD_SUBDIRECTORY(resources/translations/po)
 
 #Install our READMEs etc.
@@ -876,11 +875,17 @@
   NEWS
   PACKAGING
   README
-  README.MacOSX
   TODO
   TRANSLATION
   DESTINATION ${DOCDIR}
 )
+
+IF (APPLE)
+  INSTALL(FILES
+    README.MacOSX
+    DESTINATION ${DOCDIR}
+  )
+ENDIF (APPLE)
 
 #Install our MIME data
 INSTALL(FILES

Modified: trunk/Scribus/resources/templates/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17500&path=/trunk/Scribus/resources/templates/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/templates/CMakeLists.txt (original)
+++ trunk/Scribus/resources/templates/CMakeLists.txt Sun May  6 21:09:13 2012
@@ -2,6 +2,11 @@
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
 )
+
+# Gentoo has an option for no templates. Let's make the ebuild simpler and open up the option to others, but leave as a default for us. Make the directory in any case as our source will look for it.
+IF (WANT_NOTEMPLATES)
+  INSTALL(CODE "FILE(MAKE_DIRECTORY ${ENV}${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})")
+ELSE (WANT_NOTEMPLATES)
 
 INSTALL(FILES
 template.xml
@@ -351,3 +356,5 @@
 buscard_coll/Business_Card_Collection.png
   DESTINATION ${TEMPLATEDIR}buscard_coll
 )
+
+ENDIF (WANT_NOTEMPLATES)

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17500&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt Sun May  6 21:09:13 2012
@@ -3,7 +3,10 @@
 ${CMAKE_SOURCE_DIR}/scribus
 )
 
-ADD_SUBDIRECTORY(samples)
+# Gentoo has an option for no examples. Let's make the ebuild simpler and open up the option to others, but leave as a default for us
+IF (NOT WANT_NOEXAMPLES)
+  ADD_SUBDIRECTORY(samples)
+ENDIF (NOT WANT_NOEXAMPLES)
 ADD_SUBDIRECTORY(scripts)
 
 SET(SCRIPTER_PLUGIN_UI_SRC




More information about the scribus-commit mailing list