From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 21 Nov 2005 02:30:37 +0000 (+0000)
Subject: issue #5775
X-Git-Tag: 1.4.0-beta1~3273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b39076b985b77e23968e6e2dfbd71417a6ee4f98;p=thirdparty%2Fasterisk.git

issue #5775


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/ChangeLog b/ChangeLog
index 8bdb149262..05f6817f05 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makefile b/Makefile
index 815644f812..69e57fea41 100755
--- a/Makefile
+++ b/Makefile
@@ -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 12d5032459..6913ef4cb4 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