Makefile fixed. Again.

This commit is contained in:
Joelixny 2014-03-26 18:50:05 -04:00
parent 6c4e2fa402
commit d43bb3009e

View File

@ -1,23 +1,21 @@
SINGLE_USER = false SINGLE_USER = false
ifndef VLC_SUPPORT ifndef VLC_SUPPORT
VLC_SUPPORT = true VLC_SUPPORT = true
endif endif
BASE_PATH = /usr
LOCAL_PATH = ~/.local
ifeq ($(SINGLE_USER),false) ifeq ($(SINGLE_USER),false)
BASE_PATH = /usr
VLC_LIB_PATH = /usr/lib
else
BASE_PATH = ${HOME}/.local
VLC_LIB_PATH = ${HOME}/.local/share
endif
BIN_PATH = ${PREFIX}$(BASE_PATH)/bin BIN_PATH = ${PREFIX}$(BASE_PATH)/bin
LIB_PATH = ${PREFIX}$(BASE_PATH)/lib LIB_PATH = ${PREFIX}$(BASE_PATH)/lib
APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications
SHARE_PATH = ${PREFIX}$(BASE_PATH)/share SHARE_PATH = ${PREFIX}$(BASE_PATH)/share
else
BIN_PATH = $(LOCAL_PATH)/syncplay
LIB_PATH = $(LOCAL_PATH)/syncplay
APP_SHORTCUT_PATH = $(LOCAL_PATH)/share/applications
SHARE_PATH = $(LOCAL_PATH)/share
endif
common: common:
-mkdir -p $(LIB_PATH)/syncplay/resources/ -mkdir -p $(LIB_PATH)/syncplay/resources/
@ -33,6 +31,10 @@ common:
cp -r resources/lua/intf/*.lua $(LIB_PATH)/syncplay/resources/lua/intf/ cp -r resources/lua/intf/*.lua $(LIB_PATH)/syncplay/resources/lua/intf/
cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/ cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/
cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/ cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/
ifeq ($(SINGLE_USER),true)
@echo -e '\n**********\n**********\n \nRemeber to add ${HOME}/.local/bin to your $$PATH with "PATH=$$PATH:${HOME}/.local/bin"\n \n**********\n**********\n'
endif
u-common: u-common:
-rm -rf $(LIB_PATH)/syncplay -rm -rf $(LIB_PATH)/syncplay
@ -49,14 +51,14 @@ client:
cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
ifeq ($(VLC_SUPPORT),true) ifeq ($(VLC_SUPPORT),true)
-mkdir -p $(LIB_PATH)/vlc/lua/intf/ -mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/
cp resources/lua/intf/syncplay.lua $(LIB_PATH)/vlc/lua/intf/ cp resources/lua/intf/syncplay.lua $(VLC_LIB_PATH)/vlc/lua/intf/
endif endif
u-client: u-client:
-rm $(BIN_PATH)/syncplay -rm $(BIN_PATH)/syncplay
-rm $(LIB_PATH)/syncplay/syncplayClient.py -rm $(LIB_PATH)/syncplay/syncplayClient.py
-rm $(LIB_PATH)/vlc/lua/intf/syncplay.lua -rm $(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua
-rm $(APP_SHORTCUT_PATH)/syncplay.desktop -rm $(APP_SHORTCUT_PATH)/syncplay.desktop
server: server: