Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed Makefile. Again.

Browse Source
This commit is contained in:
Joelixny 2014-03-26 18:51:47 -04:00
parent 0ce51372b8
commit 43ffa127c1
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -4,30 +4,18 @@ ifndef VLC_SUPPORT
VLC_SUPPORT = true VLC_SUPPORT = true
endif endif
<<<<<<< HEAD
ifeq ($(SINGLE_USER),false) ifeq ($(SINGLE_USER),false)
BASE_PATH = /usr BASE_PATH = /usr
VLC_LIB_PATH = /usr/lib VLC_LIB_PATH = /usr/lib
else else
BASE_PATH = ${HOME}/.local BASE_PATH = ${HOME}/.local
VLC_LIB_PATH = ${HOME}/.local/share VLC_LIB_PATH = ${HOME}/.local/share
=======
ifeq ($(SINGLE_USER),false)
BASE_PATH = /usr
else
BASE_PATH = ~/.local
>>>>>>> bbee87932a9c5db007692c7958752dbbcd094418
endif 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
<<<<<<< HEAD
=======
>>>>>>> bbee87932a9c5db007692c7958752dbbcd094418
common: common:
-mkdir -p $(LIB_PATH)/syncplay/resources/ -mkdir -p $(LIB_PATH)/syncplay/resources/