Merge branch 'master' into master

pull/140/head
commit 8986de36fc

@ -92,7 +92,7 @@ uninstall:
done done
@for FILE_ICON in $(wildcard icons/*/*.svg); do \ @for FILE_ICON in $(wildcard icons/*/*.svg); do \
SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \
$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON}"; \ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \
done done
@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
@ -146,7 +146,7 @@ install: check uninstall
clean: clean:
@echo "Clean ..." @echo "Clean ..."
@$(RM) -rd ${CMAKE_BUILD_DIR} @$(RM) -rd "${CMAKE_BUILD_DIR}"
@if [[ -d "${CMAKE_BUILD_DIR}" ]]; then \ @if [[ -d "${CMAKE_BUILD_DIR}" ]]; then \
echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \ echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
else \ else \
@ -159,7 +159,7 @@ help:
echo "... init"; \ echo "... init"; \
echo "... debug"; \ echo "... debug"; \
echo "... prepare"; \ echo "... prepare"; \
echo "... build"; \ echo "... compile"; \
echo "... install"; \ echo "... install"; \
echo "... uninstall"; \ echo "... uninstall"; \
echo "... clean" echo "... clean"
Loading…
Cancel
Save