From e73b4c333877b65fe8cbb325538b79dbc13e5443 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Tue, 22 Mar 2016 23:33:38 +0100 Subject: [PATCH] Correct old statements in Makefiles --- build/make/btsync.mk | 3 ++- build/make/chrome.mk | 2 +- build/make/compile.mk | 2 +- build/make/firefox.mk | 2 +- build/make/ftp.mk | 3 +-- build/make/gmrender.mk | 4 ++-- build/make/hamachi.mk | 6 +++--- build/make/lighttpd-php.mk | 2 +- build/make/minidlna.mk | 4 ++-- build/make/pulseaudio.mk | 2 +- build/make/redis.mk | 4 ++-- build/make/testing.mk | 3 --- build/make/upnpproxy.mk | 4 ++-- build/make/user.mk | 2 +- build/make/webserver.mk | 2 +- 15 files changed, 21 insertions(+), 24 deletions(-) delete mode 100644 build/make/testing.mk diff --git a/build/make/btsync.mk b/build/make/btsync.mk index b742c37..acf7973 100644 --- a/build/make/btsync.mk +++ b/build/make/btsync.mk @@ -1,3 +1,4 @@ btsync: $(call script,$@) - $(call runit,$@) \ No newline at end of file + $(call runit,$@) + $(call boot,02,$@) \ No newline at end of file diff --git a/build/make/chrome.mk b/build/make/chrome.mk index 0615c90..17a8fad 100644 --- a/build/make/chrome.mk +++ b/build/make/chrome.mk @@ -1,2 +1,2 @@ chrome: - ln -f $(BASE)/scripts/*_$@.sh build/scripts \ No newline at end of file + $(call script,$@) \ No newline at end of file diff --git a/build/make/compile.mk b/build/make/compile.mk index 3a92e2a..5ba4578 100644 --- a/build/make/compile.mk +++ b/build/make/compile.mk @@ -1,2 +1,2 @@ compile: - ln -f $(BASE)/scripts/*_$@.sh build/scripts \ No newline at end of file + $(call script,$@) \ No newline at end of file diff --git a/build/make/firefox.mk b/build/make/firefox.mk index 4d61e45..1438e8a 100644 --- a/build/make/firefox.mk +++ b/build/make/firefox.mk @@ -1,2 +1,2 @@ firefox: user - ln -f $(BASE)/scripts/*_$@.sh build/scripts \ No newline at end of file + $(call script,$@) \ No newline at end of file diff --git a/build/make/ftp.mk b/build/make/ftp.mk index 95aa1ad..513f512 100644 --- a/build/make/ftp.mk +++ b/build/make/ftp.mk @@ -1,3 +1,2 @@ ftp: - $(call script,$@) - $(call runit,$@) + $(call script,$@) \ No newline at end of file diff --git a/build/make/gmrender.mk b/build/make/gmrender.mk index 3f4a335..182d1a7 100644 --- a/build/make/gmrender.mk +++ b/build/make/gmrender.mk @@ -1,3 +1,3 @@ gmrender: compile - cp $(BASE)/scripts/*_$@.sh build/scripts - cp $(BASE)/runit/$@ build/runit \ No newline at end of file + $(call script,$@) + $(call runit,$@) \ No newline at end of file diff --git a/build/make/hamachi.mk b/build/make/hamachi.mk index 182334c..4b1dab5 100644 --- a/build/make/hamachi.mk +++ b/build/make/hamachi.mk @@ -1,4 +1,4 @@ hamachi: - ln -f $(BASE)/scripts/*_$@.sh build/scripts - ln -f $(BASE)/runit/$@ build/runit - ln -f $(BASE)/boot/*_$@.sh build/boot \ No newline at end of file + $(call script,$@) + $(call runit,$@) + $(call boot,02,$@) \ No newline at end of file diff --git a/build/make/lighttpd-php.mk b/build/make/lighttpd-php.mk index 10070de..001bf52 100644 --- a/build/make/lighttpd-php.mk +++ b/build/make/lighttpd-php.mk @@ -1,3 +1,3 @@ lighttpd-php: php lighttpd $(call script,$@) - $(call boot,02,$@) + $(call boot,02,$@) \ No newline at end of file diff --git a/build/make/minidlna.mk b/build/make/minidlna.mk index d10365b..f9e9c71 100644 --- a/build/make/minidlna.mk +++ b/build/make/minidlna.mk @@ -1,3 +1,3 @@ minidlna: compile - ln -f $(BASE)/scripts/*_$@.sh build/scripts - ln -f $(BASE)/runit/$@ build/runit \ No newline at end of file + $(call script,$@) + $(call runit,$@) \ No newline at end of file diff --git a/build/make/pulseaudio.mk b/build/make/pulseaudio.mk index 5535553..40d7eae 100644 --- a/build/make/pulseaudio.mk +++ b/build/make/pulseaudio.mk @@ -1,2 +1,2 @@ pulseaudio: - ln -f $(BASE)/scripts/*_$@.sh build/scripts \ No newline at end of file + $(call script,$@) \ No newline at end of file diff --git a/build/make/redis.mk b/build/make/redis.mk index 3330d0a..b4be393 100644 --- a/build/make/redis.mk +++ b/build/make/redis.mk @@ -1,3 +1,3 @@ redis: - ln -f $(BASE)/scripts/*_$@.sh build/scripts - ln -f $(BASE)/runit/$@ build/runit \ No newline at end of file + $(call script,$@) + $(call runit,$@) \ No newline at end of file diff --git a/build/make/testing.mk b/build/make/testing.mk deleted file mode 100644 index b0b625f..0000000 --- a/build/make/testing.mk +++ /dev/null @@ -1,3 +0,0 @@ -testing: - #$(call download,$@) - $(call download,scripts/$@,/opt/tmp) \ No newline at end of file diff --git a/build/make/upnpproxy.mk b/build/make/upnpproxy.mk index 7d59382..51e3d12 100644 --- a/build/make/upnpproxy.mk +++ b/build/make/upnpproxy.mk @@ -1,3 +1,3 @@ upnpproxy: compile - cp $(BASE)/scripts/*_$@.sh build/scripts - cp $(BASE)/runit/$@ build/runit \ No newline at end of file + $(call script,$@) + $(call runit,$@) \ No newline at end of file diff --git a/build/make/user.mk b/build/make/user.mk index d98b7a2..f6e103f 100644 --- a/build/make/user.mk +++ b/build/make/user.mk @@ -1,2 +1,2 @@ user: - ln -f $(BASE)/scripts/*_$@.sh build/scripts \ No newline at end of file + $(call script,$@) \ No newline at end of file diff --git a/build/make/webserver.mk b/build/make/webserver.mk index a32d8e0..c02ca1a 100644 --- a/build/make/webserver.mk +++ b/build/make/webserver.mk @@ -1,3 +1,3 @@ webserver: lighttpd-php phpmyadmin $(call script,$@) - $(call boot,02,$@) + $(call boot,02,$@) \ No newline at end of file