Minor compilation fixes

- Corrected install path for gui executable
- Changed directory for chip-id files

CMakeLists.txt

@@ -78,8 +78,8 @@ include(GNUInstallDirs) # Define GNU standard installation directories
 cmake_host_system_information(RESULT OS_NAME QUERY OS_NAME)
 message(STATUS "Checking for OS_NAME: ${OS_NAME}")
 
-message(STATUS "set(CMAKE_INSTALL_SHAREDIR /usr/share)")
-set(CMAKE_INSTALL_SHAREDIR /usr/share/)
+message(STATUS "set(CMAKE_INSTALL_SHAREDIR /usr/local/share)")
+set(CMAKE_INSTALL_SHAREDIR /usr/local/share/)
 
 
 ## Set C build flags

src/stlink-gui/CMakeLists.txt

@@ -24,19 +24,12 @@ if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
 
         set(GUI_SOURCES gui.c gui.h)
 
-        ## stlink-gui-local
-        add_executable(stlink-gui-local ${GUI_SOURCES})
-        file(COPY stlink-gui.ui DESTINATION ${CMAKE_BINARY_DIR}/bin)
-        set_target_properties(stlink-gui-local PROPERTIES
-                COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_BINARY_DIR}/bin")
-        target_link_libraries(stlink-gui-local ${STLINK_LIB_SHARED} ${SSP_LIB} ${GTK3_LDFLAGS})
-
         ## stlink-gui
         add_executable(stlink-gui ${GUI_SOURCES})
         install(FILES stlink-gui.ui DESTINATION ${CMAKE_INSTALL_SHAREDIR}/${PROJECT_NAME})
         set_target_properties(stlink-gui PROPERTIES
                 COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_SHAREDIR}/${PROJECT_NAME}")
         target_link_libraries(stlink-gui ${STLINK_LIB_SHARED} ${SSP_LIB} ${GTK3_LDFLAGS})
-        install(TARGETS stlink-gui DESTINATION ${CMAKE_INSTALL_SHAREDIR}/${PROJECT_NAME})
+        install(TARGETS stlink-gui DESTINATION ${CMAKE_BINDIR})
     endif ()
 endif ()

src/stlink-lib/flashloader.c

@@ -51,8 +51,7 @@ int stm32l1_write_half_pages(stlink_t *sl, stm32_addr_t addr, uint8_t *base,
     }
 
     if (sl->verbose >= 1) {
-      // show progress; writing procedure is slow and previous errors are
-      // misleading
+      // show progress; writing procedure is slow and previous errors are misleading
       fprintf(stdout, "\r%3u/%u halfpages written", count + 1, num_half_pages);
       fflush(stdout);
     }