via: e8335f588002217240ab49bc12504b42e89114d4 (commit)
from: 837c6ff6e828d1f81c8df2ac71d0733eb97f9fd1 (commit)
= COMMIT LOG ===========================================================
committer: Michal Bielicki - cypromis
comments:
added DESTDIR to esl makefiles so that it can be used during rpm building
diff --git a/libs/esl/php/Makefile b/libs/esl/php/Makefile
index 44fdd22..e970ff7 100644
--- a/libs/esl/php/Makefile
+++ b/libs/esl/php/Makefile
@@ -25,6 +25,6 @@ swigclean:
reswig: swigclean esl_wrap.cpp
install: ESL.so
- cp ESL.so $(shell php-config --extension-dir)
- cp ESL.php $(shell php -r 'echo ini_get("include_path");' | cut -d: -f2)
- echo 'extension=ESL.so' >> $(shell php-config --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=)/esl.ini
+ cp ESL.so $(DESTDIR)/$(shell php-config --extension-dir)
+ cp ESL.php /$(DESTDIR)/$(shell php -r 'echo ini_get("include_path");' | cut -d: -f2)
+ echo 'extension=ESL.so' >> $(DESTDIR)/$(shell php-config --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=)/esl.ini
diff --git a/libs/esl/python/Makefile b/libs/esl/python/Makefile
index 6b7147b..0d9ca84 100644
--- a/libs/esl/python/Makefile
+++ b/libs/esl/python/Makefile
@@ -1,6 +1,6 @@
LOCAL_CFLAGS=`python ./python-config --includes`
LOCAL_LDFLAGS=`python ./python-config --ldflags`
-SITE_DIR=`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
+SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
all: _ESL.so
Summary of changes: libs/esl/php/Makefile | 6 +++--- libs/esl/python/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630
--
FreeSWITCH Source