commit 5213a1acdc9f5bda48043347d27fc3440f328aba
parent 6998f7cade78ade3b79bd381a6dfa7ee1d6c83f0
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 18 Mar 2016 14:48:21 +0100
Install the manual pages in their right directories
Diffstat:
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -79,19 +79,17 @@ set(SCHIFF_FILES_INC
schiff_mesh.h
schiff_optical_properties.h
schiff_streamline.h)
-set(SCHIFF_FILES_DOC
- COPYING.fr
- COPYING.en
- README.md
- doc/schiff.1
- doc/schiff-geometry.5
- doc/schiff-output.5)
+set(SCHIFF_FILES_DOC COPYING.fr COPYING.en README.md)
+set(SCHIFF_FILES_MAN1 schiff.1)
+set(SCHIFF_FILES_MAN5 schiff-geometry.5 schiff-output.5)
# Prepend each file in the `SCHIFF_FILES_<SRC|INC>' list by the absolute
# path of the directory in which they lie
rcmake_prepend_path(SCHIFF_FILES_SRC ${SCHIFF_SOURCE_DIR})
rcmake_prepend_path(SCHIFF_FILES_INC ${SCHIFF_SOURCE_DIR})
rcmake_prepend_path(SCHIFF_FILES_DOC ${PROJECT_SOURCE_DIR}/../)
+rcmake_prepend_path(SCHIFF_FILES_MAN1 ${PROJECT_SOURCE_DIR}/../doc/man1)
+rcmake_prepend_path(SCHIFF_FILES_MAN5 ${PROJECT_SOURCE_DIR}/../doc/man5)
if(CMAKE_COMPILER_IS_GNUCC)
set(MATH_LIB m)
@@ -115,5 +113,7 @@ install(TARGETS schiff
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
install(FILES ${SCHIFF_FILES_DOC} DESTINATION doc/schiff)
+install(FILES ${SCHIFF_FILES_MAN1} DESTINATION doc/man1)
+install(FILES ${SCHIFF_FILES_MAN5} DESTINATION doc/man5)
rcmake_install_runtime_libraries(schiff)
diff --git a/doc/schiff.1 b/doc/man1/schiff.1
diff --git a/doc/schiff-geometry.5 b/doc/man5/schiff-geometry.5
diff --git a/doc/schiff-output.5 b/doc/man5/schiff-output.5
diff --git a/doc/schiff-geometry.5 b/doc/schiff-geometry.5
@@ -5,7 +5,7 @@ schiff-geometry \- control the shape of soft particles
A \fBschiff-geometry\fR is a YAML [1] file that controls the geometry
distribution of a family of soft particles. The
.BR schiff (1)
-program relies on this description to sample a set of soft particles
+program relies on this description to sample a set of soft particles
in order to estimate the radiative properties of their family.
.PP
A geometry is defined by a shape type whose parameters are controlled by a
@@ -27,7 +27,7 @@ to a distribution of its \fBradius\fR. A cylindrical geometry distribution can
be declared in two ways. Either directly, by defining the distribution of the
\fBheight\fR and the \fBradius\fR of the cylinder shape, or by fixing its
height/radius \fBaspect_ratio\fR and defining the distribution of the
-\fBradius\fR of a sphere whose volume is equal to the cylinder volume.
+\fBradius\fR of a sphere whose volume is equal to the cylinder volume.
.PP
All the aforementioned shape parameters can be distributed with respect to the
following distributions:
@@ -147,7 +147,7 @@ and spherical soft particles have a fixed radius:
height: {lognormal: { zeta: 1, sigma: 1.5 } }
slices: 32 # Discretisation in 32 slices
proba: 1\fR
-.SH NOTE
+.SH NOTES
.TP
[1]
YAML Ain't Markup Language \- http://yaml.org