From 1052761fb79c4ad1a8b23c6fc7fff3e214cc1af7 Mon Sep 17 00:00:00 2001
From: Michael Wild <themiwi@users.sourceforge.net>
Date: Sat, 12 Mar 2011 16:52:18 +0100
Subject: [PATCH] FIX: Configuration & installation of utility scripts

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
---
 data/utilities/CMakeLists.txt | 11 +----------
 doc/UserGuide/CMakeLists.txt  |  5 +++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/data/utilities/CMakeLists.txt b/data/utilities/CMakeLists.txt
index 3ff656569..573b79c0c 100644
--- a/data/utilities/CMakeLists.txt
+++ b/data/utilities/CMakeLists.txt
@@ -29,13 +29,6 @@
 #   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #-------------------------------------------------------------------------------
 
-if(FOAM_NEED_PNGMATH)
-  foam_configure_files(noinstUtils
-    DESTDIR data/utilities
-    foamPNGMathFilter.py.in
-    )
-endif()
-
 if(NOT WIN32)
   set(FOAM_STRIP_SUFFIXES "\\.py\\.in$" "\\.in$")
 endif()
@@ -46,10 +39,8 @@ foam_configure_files(installDevUtils
   doxyToX.py.in
   extractBrief.py.in
   foamNew.py.in
+  foamPNGMathFilter.py.in
   wmakeToCMake.cmake.in
-
-  COPYONLY
-  foamPackSource
   )
 
 if(CMAKE_SYSTEM_NAME STREQUAL SunOS)
diff --git a/doc/UserGuide/CMakeLists.txt b/doc/UserGuide/CMakeLists.txt
index e9d53b1ff..d851ba690 100644
--- a/doc/UserGuide/CMakeLists.txt
+++ b/doc/UserGuide/CMakeLists.txt
@@ -156,14 +156,15 @@ set(ADOC_xhtml_ALL_CONF "${ADOC_xhtml_MAIN_CONF}"
   "${CMAKE_BINARY_DIR}/data/asciidoc/common.conf"
   "${CMAKE_BINARY_DIR}/data/asciidoc/docbook.conf")
 
+set(PNGMATH_FILTER
+  "${CMAKE_BINARY_DIR}/data/utilities/foamPNGMathFilter${FOAM_PY_SCRIPT_SUFFIX}")
 set(CONF_ASCIIDOC_SRCS)
 foreach(f IN LISTS ASCIIDOC_SRCS)
   if(FOAM_NEED_PNGMATH)
     set(ff "${CMAKE_CURRENT_BINARY_DIR}/${f}")
     list(APPEND CONF_ASCIIDOC_SRCS "${ff}")
     add_custom_command(OUTPUT "${ff}"
-      COMMAND "${PYTHON_EXECUTABLE}"
-        "${CMAKE_BINARY_DIR}/data/utilities/foamPNGMathFilter.py"
+      COMMAND "${PYTHON_EXECUTABLE}" "${PNGMATH_FILTER}"
         -m "${CMAKE_CURRENT_BINARY_DIR}/math"
         -D 120 -o "${ff}" "${CMAKE_CURRENT_SOURCE_DIR}/${f}"
       DEPENDS "${f}" "${CMAKE_SOURCE_DIR}/data/utilities/foamPNGMathFilter.py.in"
-- 
2.11.4.GIT