From 50c1aac418ddbe05cfb42c794d5a6076f6f7721a Mon Sep 17 00:00:00 2001 From: "yang.zhenzhen" Date: Tue, 7 Mar 2017 12:56:57 +0800 Subject: [PATCH] 1 fix path error check --- DebMakefile.Makefile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/DebMakefile.Makefile b/DebMakefile.Makefile index aa0c010..017ee89 100644 --- a/DebMakefile.Makefile +++ b/DebMakefile.Makefile @@ -8,7 +8,9 @@ ORANGE_PATH ?= $(SOFTWARE_PATH)/orangedd export $$PATH := $(PHP_PATH)/bin:$$PATH export $$PATH := $(OEPNRESTY_PATH)/bin:$$PATH -prerequisites: +prerequisites:prerequisites-yum + +prerequisites-yum: mkdir -p $(SOFTWARE_PATH) sudo yum install -y readline-devel pcre-devel openssl-devel gcc wget \ icu libicu libicu-devel \ @@ -26,7 +28,13 @@ prerequisites: # libcurl4-gnutls-dev # libpng-dev # libmcrypt-dev - # libjpeg-dev + # libjpeg-dev + + +fedora-systemtap:prerequisites + + + prerequisites-ubuntu: @@ -53,7 +61,7 @@ lor: openresty cd lor && git pull && \ sudo make install orange: lor - test -d orange || git clone https://github.com/thisverygoodhhhh/orange.git $(ORANGE_PATH) + test -d $(ORANGE_PATH) || git clone https://github.com/thisverygoodhhhh/orange.git $(ORANGE_PATH) cd $(ORANGE_PATH) && git checkout master php7: @@ -131,4 +139,10 @@ librabbitmq: ldconfig \ )\ -install: prerequisites openresty orange php7 php7-ext-stomp php7-ext-redis php7-ext-phalcon php-amqp php-composer \ No newline at end of file +install: prerequisites openresty orange php7 php7-ext-stomp php7-ext-redis php7-ext-phalcon php-amqp php-composer + + +update-orange: orange + cd $(ORANGE_PATH) && git checkout master && git pull origin master + +update-lor: lor