[Asterisk-cvs] asterisk ChangeLog, 1.146.2.15, 1.146.2.16 Makefile, 1.226.2.2, 1.226.2.3

[russell]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv19633

Modified Files:
      Tag: v1-2
	ChangeLog Makefile 
Log Message:
issue #5775


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.146.2.15
retrieving revision 1.146.2.16
diff -u -d -r1.146.2.15 -r1.146.2.16
--- ChangeLog	21 Nov 2005 02:03:23 -0000	1.146.2.15
+++ ChangeLog	21 Nov 2005 02:44:06 -0000	1.146.2.16
@@ -1,5 +1,7 @@
 2005-11-20  Russell Bryant  <russell at 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.

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.226.2.2
retrieving revision 1.226.2.3
diff -u -d -r1.226.2.2 -r1.226.2.3
--- Makefile	21 Nov 2005 02:03:23 -0000	1.226.2.2
+++ Makefile	21 Nov 2005 02:44:06 -0000	1.226.2.3
@@ -534,7 +534,7 @@
 	$(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 \