Properly install libsrc

z88dk · Nov 6, 2023 · 7090f83 · 7090f83
1 parent f4ae915
commit 7090f83
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,19 +80,19 @@ ProcessorCount(NPROC)
 
 set(LIBSRC_OVERRIDES
     ZCCCFG=${PROJECT_SOURCE_DIR}/lib/config
-    PATH=/bin:/usr/bin:${CMAKE_BINARY_DIR}/src/zcc:${CMAKE_BINARY_DIR}/src/ucpp:${CMAKE_BINARY_DIR}/src/zpragma:${CMAKE_BINARY_DIR}/src/sccz80:${CMAKE_BINARY_DIR}/src/copt:${CMAKE_BINARY_DIR}/src/z80asm
+    PATH=/bin:/usr/bin:${CMAKE_BINARY_DIR}/src/zcc:${CMAKE_BINARY_DIR}/src/ucpp:${CMAKE_BINARY_DIR}/src/zpragma:${CMAKE_BINARY_DIR}/src/sccz80:${CMAKE_BINARY_DIR}/src/copt:${CMAKE_BINARY_DIR}/src/z80asm:${CMAKE_BINARY_DIR}/src/zx0
 )
 
 add_custom_target(libsrc
     ALL
     DEPENDS zcc z88dk-ucpp z88dk-zpragma z88dk-sccz80 z88dk-copt z88dk-z80asm
     BYPRODUCTS ${CMAKE_BINARY_DIR}/libsrc
     COMMAND make -C ${PROJECT_SOURCE_DIR}/libsrc ${LIBSRC_OVERRIDES} -j${NPROC} && make -C ${PROJECT_SOURCE_DIR}/libsrc install
-    COMMAND make -C ${PROJECT_SOURCE_DIR}/libsrc/_DEVELOPMENT ${LIBSRC_OVERRIDES} -j${NPROC} && make -C ${PROJECT_SOURCE_DIR}/libsrc/_DEVELOPMENT install
-    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/libsrc && mv ${PROJECT_SOURCE_DIR}/libsrc/*.lib ${CMAKE_BINARY_DIR}/libsrc
+    COMMAND make -C ${PROJECT_SOURCE_DIR}/libsrc/_DEVELOPMENT ${LIBSRC_OVERRIDES} -j${NPROC}
+    COMMAND make -C ${PROJECT_SOURCE_DIR}/include/_DEVELOPMENT ${LIBSRC_OVERRIDES} -j${NPROC}
 )
 
 # Install standard library
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/include DESTINATION share/z88dk)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/lib DESTINATION share/z88dk)
-install(DIRECTORY ${CMAKE_BINARY_DIR}/libsrc DESTINATION share/z88dk/)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/libsrc DESTINATION share/z88dk/)