diff --git a/Makefile b/Makefile index 21263cf..741d2c8 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,10 @@ DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/${PKGNAME}.h +<<<<<<< HEAD +======= +PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) +>>>>>>> 99554f5a8990d7e4a6abea8fe763c3ba03bdc358 default_target: all @@ -159,7 +163,7 @@ help: echo "... init"; \ echo "... debug"; \ echo "... prepare"; \ - echo "... compile"; \ + echo "... build"; \ echo "... install"; \ echo "... uninstall"; \ echo "... clean" \ No newline at end of file diff --git a/com.ublinux.ubl-settings-update.policy b/com.ublinux.ubl-settings-update.policy index 4eaf3e9..205d9b8 100644 --- a/com.ublinux.ubl-settings-update.policy +++ b/com.ublinux.ubl-settings-update.policy @@ -13,9 +13,9 @@ Authentication is required to run ubl-settings-update Требуется авторизация для запуска утилиты ubl-settings-update с правами root - auth_admin - auth_admin - auth_admin + auth_admin_keep + auth_admin_keep + auth_admin_keep /usr/bin/ubl-settings-update true