diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-21 02:30:37 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-21 02:30:37 +0000 |
commit | 073636f2ecb5344a5fedb0aa5d6f62a05295d7dd (patch) | |
tree | 77578161fc571827c9ff78b5743f17679d7a5984 | |
parent | d29dcba2f8aa13eb71dcb566aea688a4b0844300 (diff) |
issue #5775
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7164 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | ChangeLog | 2 | ||||
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | apps/Makefile | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,7 @@ 2005-11-20 Russell Bryant <russell@digium.com> + * Makefile apps/Makefile: Fix 'make install' for Solaris. (issue #5775) + * apps/app_record.c: Don't leak a frame if writing it to the file fails. (issue #5787) * Makefile: Create the monitor spool directory when the other spool directories are created. @@ -534,7 +534,7 @@ clean: $(MAKE) -C stdtime clean datafiles: all - if test $$(id -u) = 0; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi + if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros for x in sounds/digits/*.gsm; do \ diff --git a/apps/Makefile b/apps/Makefile index 12d503245..6913ef4cb 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -59,7 +59,7 @@ CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/us endif CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) -ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) +ifneq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),) ifneq (${CURLLIBS},) APPS+=app_curl.so endif |