user_manager: Respect user umask and use less code

[waydroid.git] / Makefile

diff --git a/Makefile b/Makefile
index dc54740d8d6ccace9f2b47f47c679506ad66e7fe..cc625952510722998406185e5b52e38dd1cdc141 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ install:
        install -d $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_ICONS_DIR)/hicolor/512x512/apps
        cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
        ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
-       ln -sf $(WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
+       mv $(INSTALL_WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
        mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
        mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
        cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
@@ -51,6 +51,10 @@ install:
 
 install_apparmor:
        install -d $(INSTALL_APPARMOR_DIR) $(INSTALL_APPARMOR_DIR)/lxc
+       mkdir -p $(INSTALL_APPARMOR_DIR)/local/
+       touch $(INSTALL_APPARMOR_DIR)/local/adbd
+       touch $(INSTALL_APPARMOR_DIR)/local/android_app
+       touch $(INSTALL_APPARMOR_DIR)/local/lxc-waydroid
        cp -f data/configs/apparmor_profiles/adbd $(INSTALL_APPARMOR_DIR)/adbd
        cp -f data/configs/apparmor_profiles/android_app $(INSTALL_APPARMOR_DIR)/android_app
        cp -f data/configs/apparmor_profiles/lxc-waydroid $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid