Commits

Anonymous committed 02e3692

More fixes to the installation procedure.

  • Participants
  • Parent commits 2fbbbf6
  • Branches conversion-to-cmake

Comments (0)

Files changed (6)

src/CMakeLists.txt

 
 INCLUDE ("Common.cmake")
 
+SET (WML_LIB_DIR "lib/wml")
+SET (WML_DATA_DIR "${WML_LIB_DIR}/data")
+
 SUBDIRS (
     wml_aux 
     wml_backend  

src/wml_aux/txt2html/CMakeLists.txt

 
 INSTALL(
     FILES "txt2html.dict"
-    DESTINATION "lib/data/"
+    DESTINATION "${WML_DATA_DIR}"
 )

src/wml_frontend/CMakeLists.txt

             "--subst" "PATH_PERL=${PERL_EXECUTABLE}"
         DEPENDS "${src}"
     )
-    INSTALL (FILES "${dest}" DESTINATION "bin")
+    INSTALL (
+        PROGRAMS "${dest}"
+        DESTINATION "bin"
+        RENAME "${cmd}"
+        )
     INST_POD2MAN("${cmd}_pod" "${src}" "${manname}" "1")
     ADD_CUSTOM_TARGET(
         "preprocess_perl_frontend_${cmd}" ALL

src/wml_include/CMakeLists.txt

 SET (myfiles
+    all
     des/all
     des/gfont
     des/imgbg
     sup/hextriple
     sup/path
     sys/all
+    sys/bootp3
     sys/bootp4
     sys/compat1
 )
 
+CONFIGURE_FILE(
+    "${CMAKE_CURRENT_SOURCE_DIR}/sys/bootp3.src.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/sys/bootp3.src"
+    COPY_ONLY
+)
+
 FOREACH (base ${myfiles})
     SET (destbase "${base}.wml")
     SET (dest "${CMAKE_CURRENT_BINARY_DIR}/${destbase}")
 
     STRING (REPLACE "/" "__" target_base "${base}")
 
+
     ADD_CUSTOM_COMMAND(
         OUTPUT "${dest}"
         COMMAND "${PERL_EXECUTABLE}"
         "preprocess_perl_include_${target_base}" ALL
         DEPENDS "${dest}"
     )
-    INSTALL (FILES "${dest}" DESTINATION "lib/include/${destbase}")
+    INSTALL (
+        FILES "${dest}" 
+        DESTINATION "${WML_LIB_DIR}/include/" 
+        RENAME "${destbase}"
+    )
     STRING (REPLACE "/" "::" dest_man "wml/${base}")
 
     INST_RENAME_POD2MAN(

src/wml_include/sys/bootp3.src.in

     #   don't use "use lib" here because this leads to conflict 
     #   warnings from "lib.pm" when using a Perl runtime system
     #   which is different from the one used under compile time.
-    unshift @INC, qw(
-        @INSTALLPRIVLIB@
-        @INSTALLARCHLIB@
-    );
-
     # get rid of nasty warnings
     $^W = 0;
 }

src/wml_misc/CMakeLists.txt

     FILES
         ${LOGO_FILES}
     DESTINATION
-        "lib/data/logos"
+        "${WML_DATA_DIR}/logos"
 )