[Asterisk-cvs] asterisk ChangeLog,1.61,1.62 Makefile,1.222,1.223

[kpfleming]

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

Modified Files:
	ChangeLog Makefile 
Log Message:
issue #5572


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- ChangeLog	8 Nov 2005 02:56:01 -0000	1.61
+++ ChangeLog	8 Nov 2005 03:31:45 -0000	1.62
@@ -1,5 +1,7 @@
 2005-11-07  Kevin P. Fleming  <kpfleming at digium.com>
 
+	* Makefile: correct cross-compilation issue introduced in Cygwin patches (issue #5572)
+
 	* apps/app_voicemail.c: upgrade to new arg/option API and implement priority jumping control (issue #5649)
 
 	* asterisk.c (main): setpriority() failure is not a reason to stop the process (issue #5581)

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- Makefile	8 Nov 2005 00:12:21 -0000	1.222
+++ Makefile	8 Nov 2005 03:31:45 -0000	1.223
@@ -285,12 +285,13 @@
 endif
 
 ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-CYGLOADER=cygwin_a
-OSARCH=CYGWIN
-ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
-ASTLINK=
-LIBS+=-lpthread -lncurses -lm -lresolv
-ASTSBINDIR=$(MODULES_DIR)
+  CYGLOADER=cygwin_a
+  OSARCH=CYGWIN
+  ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
+  ASTLINK=
+  LIBS+=-lpthread -lncurses -lm -lresolv
+  ASTSBINDIR=$(MODULES_DIR)
+  PROC=$(shell uname -m)
 endif
 
 ifndef WITHOUT_ZAPTEL