Set correct install path on Mac. Refs #221

git-svn-id: https://svn.nexusformat.org/definitions/trunk@1082 e2afd93b-eb5f-4fc1-b239-527b97798288

CMakeLists.txt

@@ -136,7 +136,9 @@ add_subdirectory (manual)
 foreach(F ${XSD_FILES})
     INSTALL(FILES ${CMAKE_BINARY_DIR}/dist/${F} DESTINATION ${NEXUS_DEFINITIONS} COMPONENT definitions)
 endforeach()
+
 INSTALL(FILES LGPL.txt DESTINATION ${NEXUS_DEFINITIONS} COMPONENT definitions)
+INSTALL(FILES LGPL.txt DESTINATION ${NEXUS_MANUAL} COMPONENT manual)
 
 #
 # set CPack packaging options

CPackOptions.cmake.in

@@ -82,11 +82,15 @@ if (${CPACK_GENERATOR} STREQUAL "ZIP")
 endif()
 if (${CPACK_GENERATOR} STREQUAL "CygwinBinary")
     set(CPACK_CYGWIN_PATCH_NUMBER 1)
+    set(CPACK_INSTALL_PREFIX "/usr/share/nexus")
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/share/nexus")
 endif()
 if (${CPACK_GENERATOR} STREQUAL "PackageMaker")
 #    set(CPACK_MONOLITHIC_INSTALL ON)
     # 10.4 is "Tiger", component based install needs 10.4 and above
     set(CPACK_OSX_PACKAGE_VERSION 10.4) 
+    set(CPACK_INSTALL_PREFIX "/usr/share/nexus")
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/share/nexus")
 endif()
 if (${CPACK_GENERATOR} STREQUAL "Bundle")
 endif()

manual/CMakeLists.txt

@@ -214,7 +214,7 @@ if (XSLTPROC)
     add_custom_command( 
         OUTPUT    ${CMAKE_BINARY_DIR}/manual/NeXusManual.html
         COMMAND   ${CMAKE_COMMAND}
-        ARGS      -E rename ${CMAKE_BINARY_DIR}/manual/index.html ${CMAKE_BINARY_DIR}/manual/NeXusManual.html
+        ARGS      -E copy_if_different ${CMAKE_BINARY_DIR}/manual/index.html ${CMAKE_BINARY_DIR}/manual/NeXusManual.html
         DEPENDS   ${CMAKE_BINARY_DIR}/manual/index.html
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/manual
         COMMENT   "Generating NeXusManual.html"

package/README.txt

@@ -1 +1,5 @@
-README
+README for installer GUI
+------------------------
+
+Unless specified otherwise, files will be installed in a default location root
+such as  /usr/share/nexus/  or  /usr/local/share/nexus/

package/WELCOME.txt

@@ -1 +1,3 @@
-WELCOME
+Welcome to the NeXus definitions and documentation installer.
+
+For more details on NeXus see http://www.nexusformat.org/

package/description.txt

@@ -1,9 +1,13 @@
 NeXus: A common data format for neutron, X-ray and muon science.
 
-         http://www.nexusformat.org
+         http://www.nexusformat.org/
 
 NeXus is developed as an international standard by scientists 
 and programmers representing major scientific facilities in 
 Europe, Asia, Australia, and North America in order to facilitate 
 greater cooperation in the analysis and visualization of neutron, 
 X-ray, and muon data. 
+
+This installer package contains:
+* NeXus base class and instrument definitions in NXDL format
+* NeXus documentation and examples, such as the user and reference manuals