issue #5775

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7165 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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.

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 \

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