[asterisk-commits] trunk r9163 - in /trunk: ./ channels/misdn/Makefile

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Feb 6 13:18:18 MST 2006


Author: kpfleming
Date: Mon Feb  6 14:18:17 2006
New Revision: 9163

URL: http://svn.digium.com/view/asterisk?rev=9163&view=rev
Log:
rename properties for forward-porting fixes so they don't conflict with developer branches

Modified:
    trunk/   (props changed)
    trunk/channels/misdn/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-blocked (added)
+++ branch-1.2-blocked Mon Feb  6 14:18:17 2006
@@ -1,0 +1,1 @@
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112,8124,8134,8394,8412,8414,8418,8429,8433,8445,8562,8573,8600,8619,8666,8808,9073

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
            ('svnmerge-blocked' removed)

Propchange: trunk/
            ('svnmerge-integrated' removed)

Modified: trunk/channels/misdn/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/Makefile?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- trunk/channels/misdn/Makefile (original)
+++ trunk/channels/misdn/Makefile Mon Feb  6 14:18:17 2006
@@ -6,7 +6,7 @@
 
 # Verify those options with main Makefile
 CFLAGS		= -pipe -c -Wall
-ifeq ($(PROC),x86_64)
+ifeq ($(shell uname -m),x86_64)
 CFLAGS	       += -fPIC
 endif
 SOURCES		= isdn_lib.c isdn_msg_parser.c 



More information about the asterisk-commits mailing list