diff --git a/Makefile b/Makefile index 88825f3..1d806e4 100644 --- a/Makefile +++ b/Makefile @@ -7,26 +7,26 @@ ifeq ($(SINGLE_USER),false) BIN_PATH = $(BASE_PATH)/bin LIB_PATH = $(BASE_PATH)/lib APP_SHORTCUT_PATH = $(BASE_PATH)/share/applications - ICON_PATH = $(BASE_PATH)/share + SHARE_PATH = $(BASE_PATH)/share else BIN_PATH = $(LOCAL_PATH)/syncplay LIB_PATH = $(LOCAL_PATH)/syncplay APP_SHORTCUT_PATH = $(LOCAL_PATH)/share/applications - ICON_PATH = $(LOCAL_PATH)/share + SHARE_PATH = $(LOCAL_PATH)/share endif common: -mkdir -p $(LIB_PATH)/syncplay/ cp -r syncplay $(LIB_PATH)/syncplay/ - cp -r resources/hicolor $(ICON_PATH)/icons/ - cp resources/hicolor/48x48/apps/syncplay.png $(ICON_PATH)/app-install/icons/ - cp resources/hicolor/48x48/apps/syncplay.png $(ICON_PATH)/pixmaps/ + cp -r resources/hicolor $(SHARE_PATH)/icons/ + cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/ + cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/ u-common: -rm -rf $(LIB_PATH)/syncplay - -rm $(ICON_PATH)/icons/hicolor/*/apps/syncplay.png - -rm $(ICON_PATH)/app-install/icons/syncplay.png - -rm $(ICON_PATH)/pixmaps/syncplay.png + -rm $(SHARE_PATH)/icons/hicolor/*/apps/syncplay.png + -rm $(SHARE_PATH)/app-install/icons/syncplay.png + -rm $(SHARE_PATH)/pixmaps/syncplay.png client: -mkdir -p $(BIN_PATH) @@ -34,14 +34,14 @@ client: echo '#!/bin/sh\npython -OO $(LIB_PATH)/syncplay/syncplayClient.py "$$@"' > $(BIN_PATH)/syncplay chmod a+x $(BIN_PATH)/syncplay cp syncplayClient.py $(LIB_PATH)/syncplay/ - -mkdir -p $(ICON_PATH)/usr/share/vlc/lua/intf/ - cp resources/syncplay.lua $(ICON_PATH)/usr/share/vlc/lua/intf/ + -mkdir -p $(SHARE_PATH)/usr/share/vlc/lua/intf/ + cp resources/syncplay.lua $(SHARE_PATH)/usr/share/vlc/lua/intf/ cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ u-client: -rm $(BIN_PATH)/syncplay -rm $(LIB_PATH)/syncplay/syncplayClient.py - -rm $(ICON_PATH)/usr/share/vlc/lua/intf/syncplay.lua + -rm $(SHARE_PATH)/usr/share/vlc/lua/intf/syncplay.lua -rm $(APP_SHORTCUT_PATH)/syncplay.desktop server: