[patch] files/cmatrix-2.0-mkfontdir.patch

cmatrix-2.0-mkfontdir.patch (text/plain), 1.55 KB, created by Jeroen Roovers (RETIRED) on 2020-04-28 07:00:42 UTC

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@
 if     (UNIX)
 	foreach    (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
 		if     (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
-			message(STATUS "Installing matrix console fonts to ${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
+			message(STATUS "Installing matrix console fonts to ${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
 			install(FILES
 				"${CMAKE_SOURCE_DIR}/matrix.fnt"
 				"${CMAKE_SOURCE_DIR}/matrix.psf.gz"
@@ -57,17 +57,18 @@
 	endforeach ()
 	foreach    (X_FONTS_DIR ${X_FONTS_DIRS})
 		if     (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
-			message(STATUS "Installing matrix X window fonts to ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
+			message(STATUS "Installing matrix X window fonts to ${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
 			install(FILES
 				"${CMAKE_SOURCE_DIR}/mtx.pcf"
 				DESTINATION "${X_FONTS_DIR}")
 			install(CODE
-				"message(STATUS \"Running mkfontdir ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR} ...\")")
+				"message(STATUS \"Running mkfontdir ${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR} ...\")")
 			install(CODE
-				"execute_process(COMMAND \"${MKFONTDIR}\" \"${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}\")")
+					"execute_process(COMMAND \"${MKFONTDIR}\" \"${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}\")")
 			install(CODE
 				"message(STATUS \"If this is the first time you have installed CMatrix you will probably have to restart X window in order to use the mtx.pcf font.\")")
 		endif  ()
 	endforeach ()
 endif  ()
 
+