last tweaks

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec93ee7..6f49365 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,21 +383,21 @@ ADD_CUSTOM_COMMAND(
     COMMAND sh ${madmutt_SOURCE_DIR}/charset.def > ${madmutt_SOURCE_DIR}/charset.gperf
     COMMENT "Generating ${madmutt_SOURCE_DIR}/charset.gperf from ${madmutt_SOURCE_DIR}/charset.def"
 )
     COMMAND sh ${madmutt_SOURCE_DIR}/charset.def > ${madmutt_SOURCE_DIR}/charset.gperf
     COMMENT "Generating ${madmutt_SOURCE_DIR}/charset.gperf from ${madmutt_SOURCE_DIR}/charset.def"
 )

-SET(__mt ${CMAKE_CURRENT_SOURCE_DIR}/lib-mime/mime-token)
+SET(__mt ${madmutt_SOURCE_DIR}/lib-mime/mime-token)

 ADD_CUSTOM_COMMAND(
     OUTPUT ${__mt}.h
     MAIN_DEPENDENCY ${__mt}.sh ${__mt}.def
     COMMAND sh ${__mt}.sh ${__mt}.h < ${__mt}.def
     COMMENT "Generating ${__mt}.h from ${__mt}.def"
 )
 ADD_CUSTOM_COMMAND(
     OUTPUT ${__mt}.h
     MAIN_DEPENDENCY ${__mt}.sh ${__mt}.def
     COMMAND sh ${__mt}.sh ${__mt}.h < ${__mt}.def
     COMMENT "Generating ${__mt}.h from ${__mt}.def"
 )

-SET(__lt ${CMAKE_CURRENT_SOURCE_DIR}/lib-lua/lua-token)
+SET(__lt ${madmutt_SOURCE_DIR}/lib-lua/lua-token)

 ADD_CUSTOM_COMMAND(
     OUTPUT ${__lt}.h
     MAIN_DEPENDENCY ${__lt}.gperf
     COMMAND sh ${__lt}.gperf ${__lt}.h || \(${RM} ${__lt}.h; exit 1\)
     COMMENT "Generating ${__lt}.h from ${__lt}.gperf"
 )
 ADD_CUSTOM_COMMAND(
     OUTPUT ${__lt}.h
     MAIN_DEPENDENCY ${__lt}.gperf
     COMMAND sh ${__lt}.gperf ${__lt}.h || \(${RM} ${__lt}.h; exit 1\)
     COMMENT "Generating ${__lt}.h from ${__lt}.gperf"
 )

-SET(__lm ${CMAKE_CURRENT_SOURCE_DIR}/lib-lua/madmutt)
+SET(__lm ${madmutt_SOURCE_DIR}/lib-lua/madmutt)

 ADD_CUSTOM_COMMAND(
     OUTPUT ${__lm}.li
     MAIN_DEPENDENCY ${__lm}.cpkg
 ADD_CUSTOM_COMMAND(
     OUTPUT ${__lm}.li
     MAIN_DEPENDENCY ${__lm}.cpkg

diff --git a/lib-mime/CMakeLists.txt b/lib-mime/CMakeLists.txt
index e8f178b..2bea2f6 100644 (file)
--- a/lib-mime/CMakeLists.txt
+++ b/lib-mime/CMakeLists.txt
@@ -2,7 +2,8 @@ MACRO(TOKENS _var _script _def _out)
     ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${_out}
         MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${_def} ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
     ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${_out}
         MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${_def} ${CMAKE_CURRENT_SOURCE_DIR}/${_script}

-        COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/${_script} ${CMAKE_CURRENT_SOURCE_DIR}/${_out} < ${_def}
+        COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/${_script} ${CMAKE_CURRENT_SOURCE_DIR}/${_out}
+                   < ${CMAKE_CURRENT_SOURCE_DIR}/${_def}

         COMMENT "Generating ${CMAKE_CURRENT_SOURCE_DIR}/${_out} from ${CMAKE_CURRENT_SOURCE_DIR}/${_def}"
     )
     LIST(APPEND ${_var} ${CMAKE_CURRENT_SOURCE_DIR}/${_out})
         COMMENT "Generating ${CMAKE_CURRENT_SOURCE_DIR}/${_out} from ${CMAKE_CURRENT_SOURCE_DIR}/${_def}"
     )
     LIST(APPEND ${_var} ${CMAKE_CURRENT_SOURCE_DIR}/${_out})