Makefile return

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"

com.ublinux.ubl-settings-update.policy

@@ -13,9 +13,9 @@
     <message>Authentication is required to run ubl-settings-update</message>
     <message xml:lang="ru">Требуется авторизация для запуска утилиты ubl-settings-update с правами root</message>
     <defaults>
-      <allow_any>auth_admin</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>auth_admin</allow_active>
+      <allow_any>auth_admin_keep</allow_any>
+      <allow_inactive>auth_admin_keep</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
     <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ubl-settings-update</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>