From fe72c3d523554e43f3ea812fbd0d5028c940a38f Mon Sep 17 00:00:00 2001 From: asmeron Date: Sat, 16 Dec 2023 20:54:12 +0600 Subject: [PATCH] Fix Makefile --- Makefile | 13 ++++++++++--- source/CMakeLists.txt | 1 - 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e35e880..6fe60df 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ CMAKE_UTILS_BUILD_DIR = $(MAKEFILE_PATH)compile DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) +PRJNAME = $(subst lib,,${PKGNAME}) FILE_VER = source/CMakeLists.txt PKGIDENT=$(subst /,-,${PREFIX}) @@ -32,7 +33,7 @@ init: else \ LATEST_TAG="Development"; \ fi; \ - sed -r "s/^(project\(ublsettings VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \ + sed -r "s/^(project\(${PRJNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_UTILS_BUILD_DIR}" depend: @@ -78,13 +79,19 @@ build: depend prepare uninstall: @echo "Uninstall ..." - @$(RM) "${DESTDIR}${PREFIX}/lib/${PKGNAME}.so* - @$(RM) "${DESTDIR}${PREFIX}/include/${PKGNAME}.h* + @$(RM) "${DESTDIR}${PREFIX}/lib/${PKGNAME}".so* + @$(RM) "${DESTDIR}${PREFIX}/include/${PKGNAME}".h* + @if [ -z ${DESTDIR} ]; then \ + ldconfig -n ${DESTDIR}${PREFIX}/lib; \ + fi @echo "Uninstall: OK" install: check @echo "Install ..." @$(MAKE_COMMAND) install --directory=${CMAKE_UTILS_BUILD_DIR} + @if [ -z ${DESTDIR} ]; then \ + ldconfig -n ${DESTDIR}${PREFIX}/lib; \ + fi @echo "Install: OK" clean: diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index d275a7a..761ee99 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -13,7 +13,6 @@ add_library(${PROJECT_NAME} SHARED ublsettings.c ublsettings.h) - set(LIBRARIES pthread)