From 77ee662c87f91d56a30a21f2ef80b30320fc062a Mon Sep 17 00:00:00 2001 From: Joelixny Date: Thu, 13 Mar 2014 16:41:20 -0400 Subject: [PATCH 1/7] Fixed Makefile --- Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6995a52..1641c1a 100644 --- a/Makefile +++ b/Makefile @@ -4,20 +4,18 @@ ifndef VLC_SUPPORT VLC_SUPPORT = true endif -BASE_PATH = /usr -LOCAL_PATH = ~/.local ifeq ($(SINGLE_USER),false) + BASE_PATH = /usr +else + BASE_PATH = ~/.local +endif + BIN_PATH = ${PREFIX}$(BASE_PATH)/bin LIB_PATH = ${PREFIX}$(BASE_PATH)/lib APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications 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: -mkdir -p $(LIB_PATH)/syncplay/resources/ From d43bb3009eeaf9fa67531845f33cc926dc820a7d Mon Sep 17 00:00:00 2001 From: Joelixny Date: Wed, 26 Mar 2014 18:50:05 -0400 Subject: [PATCH 2/7] Makefile fixed. Again. --- Makefile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 6995a52..15347ed 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,21 @@ -SINGLE_USER = false +SINGLE_USER = false ifndef VLC_SUPPORT VLC_SUPPORT = true endif -BASE_PATH = /usr -LOCAL_PATH = ~/.local - 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 LIB_PATH = ${PREFIX}$(BASE_PATH)/lib APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications 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: -mkdir -p $(LIB_PATH)/syncplay/resources/ @@ -33,6 +31,10 @@ common: 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)/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: -rm -rf $(LIB_PATH)/syncplay @@ -49,14 +51,14 @@ client: cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ ifeq ($(VLC_SUPPORT),true) - -mkdir -p $(LIB_PATH)/vlc/lua/intf/ - cp resources/lua/intf/syncplay.lua $(LIB_PATH)/vlc/lua/intf/ + -mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/ + cp resources/lua/intf/syncplay.lua $(VLC_LIB_PATH)/vlc/lua/intf/ endif u-client: -rm $(BIN_PATH)/syncplay -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 server: From 43ffa127c1a71c9b8d54b400f7ffda0b6b458a73 Mon Sep 17 00:00:00 2001 From: Joelixny Date: Wed, 26 Mar 2014 18:51:47 -0400 Subject: [PATCH 3/7] Fixed Makefile. Again. --- Makefile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile b/Makefile index 6100fc8..15347ed 100644 --- a/Makefile +++ b/Makefile @@ -4,30 +4,18 @@ ifndef VLC_SUPPORT VLC_SUPPORT = true endif -<<<<<<< HEAD ifeq ($(SINGLE_USER),false) BASE_PATH = /usr VLC_LIB_PATH = /usr/lib else BASE_PATH = ${HOME}/.local VLC_LIB_PATH = ${HOME}/.local/share -======= - -ifeq ($(SINGLE_USER),false) - BASE_PATH = /usr -else - BASE_PATH = ~/.local ->>>>>>> bbee87932a9c5db007692c7958752dbbcd094418 endif BIN_PATH = ${PREFIX}$(BASE_PATH)/bin LIB_PATH = ${PREFIX}$(BASE_PATH)/lib APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications SHARE_PATH = ${PREFIX}$(BASE_PATH)/share -<<<<<<< HEAD -======= - ->>>>>>> bbee87932a9c5db007692c7958752dbbcd094418 common: -mkdir -p $(LIB_PATH)/syncplay/resources/ From 55574ab066a2957512d218a4da90c702ac6aaa52 Mon Sep 17 00:00:00 2001 From: Joelixny Date: Wed, 26 Mar 2014 19:00:23 -0400 Subject: [PATCH 4/7] Typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 15347ed..6539ab9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SINGLE_USER = false +SINGLE_USER = false ifndef VLC_SUPPORT VLC_SUPPORT = true From 9e7cdc3c150183542cc41f333bd5315677244c8f Mon Sep 17 00:00:00 2001 From: Joelixny Date: Wed, 26 Mar 2014 19:04:31 -0400 Subject: [PATCH 5/7] Added warnings. --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6539ab9..12306e2 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,6 @@ common: 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)/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: -rm -rf $(LIB_PATH)/syncplay @@ -73,15 +69,20 @@ u-server: -rm $(BIN_PATH)/syncplay-server -rm $(LIB_PATH)/syncplay/syncplayServer.py -rm $(APP_SHORTCUT_PATH)/syncplay-server.desktop + +warnings: +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 -install-client: common client +install-client: common client warnings -uninstall-client: u-client u-common +uninstall-client: u-client u-common -install-server: common server +install-server: common server warnings uninstall-server: u-server u-common -install: common client server +install: common client server warnings uninstall: u-client u-server u-common From 91aae02d7f49c8131b9cb6191f9a5b4072961af8 Mon Sep 17 00:00:00 2001 From: Joelixny Date: Thu, 27 Mar 2014 14:11:49 -0400 Subject: [PATCH 6/7] Changed Makefile a bit. --- Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 12306e2..c03e488 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -SINGLE_USER = false +SINGLE_USER = true ifndef VLC_SUPPORT - VLC_SUPPORT = true + VLC_SUPPORT = false endif ifeq ($(SINGLE_USER),false) @@ -45,6 +45,10 @@ client: chmod 755 $(BIN_PATH)/syncplay cp syncplayClient.py $(LIB_PATH)/syncplay/ cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ + +ifeq ($(SINGLE_USER),false) + chmod 755 $(APP_SHORTCUT_PATH)/syncplay.desktop +endif ifeq ($(VLC_SUPPORT),true) -mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/ @@ -65,6 +69,10 @@ server: cp syncplayServer.py $(LIB_PATH)/syncplay/ cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/ +ifeq ($(SINGLE_USER),false) + chmod 755 $(APP_SHORTCUT_PATH)/syncplay-server.desktop +endif + u-server: -rm $(BIN_PATH)/syncplay-server -rm $(LIB_PATH)/syncplay/syncplayServer.py @@ -72,7 +80,7 @@ u-server: warnings: 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' + @echo -e "\n**********\n**********\n \nRemeber to add ${HOME}/.local/bin to your \$$PATH with 'echo \"export PATH=\$$PATH:${HOME}/.local/bin\" >> ${HOME}/.profile' \nThis will take effect after you logoff.\n \n**********\n**********\n" endif install-client: common client warnings From 197d8af0edd8a0858c191ebe3e92c9632ac0a4b6 Mon Sep 17 00:00:00 2001 From: Joelixny Date: Thu, 27 Mar 2014 14:17:52 -0400 Subject: [PATCH 7/7] oops! --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c03e488..3dad0e8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -SINGLE_USER = true +SINGLE_USER = false ifndef VLC_SUPPORT - VLC_SUPPORT = false + VLC_SUPPORT = true endif ifeq ($(SINGLE_USER),false)