Property changes on: . ___________________________________________________________________ Name: branch-1.2-merged - /branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7869,7872-7897,7901-7914,7916-7959,7961-7964,7966-7969,7971-7975,7977-8046,8048-8111,8113-8123,8125-8133,8135-8393,8395-8411,8413,8415-8417,8419-8428,8430-8432,8434-8444,8446-8561,8563-8572,8574-8599,8601-8618,8620-8665,8667-8807,8809-9072,9074-9261,9263-9322,9324-9325,9327-9606,9608-9755,9757-9817,9819-9860,9862-9869,9871-9952,9954-10109,10111-10862,10864-10951,10953-11089,11165,11250,11382,11408,11410,11479,11503,11528,11530,11561,11607,11609,11634-11635,11659,11715,11778,11946,12036,12161,12195,12458,12477,12495,12577,12792,12925,12927,13026,13095,13197,13237,13239,13279,13547,13550,13634,13707,13748,13814,13851,13888,13961,13964,14140,14191,14234,14275-14276,14462,14467,14523,14659,14704,14821,14830,14868,15366,15376,15381,15615,15658,15699,15703,15896,15898,16082,16192,16303,16346,16534,16579,16581,16742,16744,17074,17147,17150,17283,17335,17489,17702,17905,18087-18089,18250,18260,18436,18494,18866,19008,19301,19303,19345,19347-19348,19351,19353,19394,19397,19812,19891,20034,20037,20966,21037,21597,21638,22596,23305,23580,23636,23638,23673,23705,23985,23988,24019,24097,24381,24496,24567,24669,24706,24837,25123,25288,25322,25518,25520,25563,25608,26050,26760,27051,27093,27468,27636,27847,27927,27973,28125,28169,28212,28337,28380-28384,28627,28651,28698,28754,28790,28794,28896,28968,29196,29398,29464,29512,29555,29696,29764,29849,29969,29971,29973,30033,30037,30239,30293,30296,30373,30424,30802,30874,31161,31194,31321,31520,31555,31738,31921,32373,32566,32582,32605,32818,33036,33235,33294,33297,33466,33480,33510,33513,33515,33548,33615,33638,33693,33724,33753,33781,33813,33841,33993,34087,34159-34160,34242,34274,34400,34627,34875,34911,35121,35334,35669,35915,36078,36253-36254 + /branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7869,7872-7897,7901-7914,7916-7959,7961-7964,7966-7969,7971-7975,7977-8046,8048-8111,8113-8123,8125-8133,8135-8393,8395-8411,8413,8415-8417,8419-8428,8430-8432,8434-8444,8446-8561,8563-8572,8574-8599,8601-8618,8620-8665,8667-8807,8809-9072,9074-9261,9263-9322,9324-9325,9327-9606,9608-9755,9757-9817,9819-9860,9862-9869,9871-9952,9954-10109,10111-10862,10864-10951,10953-11089,11165,11250,11382,11408,11410,11479,11503,11528,11530,11561,11607,11609,11634-11635,11659,11715,11778,11946,12036,12161,12195,12458,12477,12495,12577,12792,12925,12927,13026,13095,13197,13237,13239,13279,13547,13550,13634,13707,13748,13814,13851,13888,13961,13964,14140,14191,14234,14275-14276,14462,14467,14523,14659,14704,14821,14830,14868,15366,15376,15381,15615,15658,15699,15703,15896,15898,16082,16192,16303,16346,16534,16579,16581,16742,16744,17074,17147,17150,17283,17335,17489,17702,17905,18087-18089,18250,18260,18436,18494,18866,19008,19301,19303,19345,19347-19348,19351,19353,19394,19397,19812,19891,20034,20037,20966,21037,21597,21638,22596,23305,23580,23636,23638,23673,23705,23985,23988,24019,24097,24381,24496,24567,24669,24706,24837,25123,25288,25322,25518,25520,25563,25608,26050,26760,27051,27093,27468,27636,27847,27927,27973,28125,28169,28212,28337,28380-28384,28627,28651,28698,28754,28790,28794,28896,28968,29196,29398,29464,29512,29555,29696,29764,29849,29969,29971,29973,30033,30037,30239,30293,30296,30373,30424,30802,30874,31161,31194,31321,31520,31555,31738,31921,32373,32566,32582,32605,32818,33036,33235,33294,33297,33466,33480,33510,33513,33515,33548,33615,33638,33693,33724,33753,33781,33813,33841,33993,34087,34159-34160,34242,34274,34400,34627,34875,34911,35121,35334,35669,35915,36078,36253-36254,36290 Index: Makefile =================================================================== --- Makefile (revision 36316) +++ Makefile (working copy) @@ -66,16 +66,16 @@ # Define standard directories for various platforms # These apply if they are not redefined in asterisk.conf ifeq ($(OSARCH),SunOS) - ASTETCDIR=/etc/opt/asterisk + ASTETCDIR=/var/etc/asterisk ASTLIBDIR=/opt/asterisk/lib - ASTVARLIBDIR=/var/opt/asterisk/lib - ASTSPOOLDIR=/var/opt/asterisk/spool - ASTLOGDIR=/var/opt/asterisk/log - ASTHEADERDIR=/opt/asterisk/usr/include/asterisk - ASTBINDIR=/opt/asterisk/usr/bin - ASTSBINDIR=/opt/asterisk/usr/sbin - ASTVARRUNDIR=/var/opt/asterisk/run - ASTMANDIR=/opt/asterisk/usr/share/man + ASTVARLIBDIR=/var/opt/asterisk + ASTSPOOLDIR=/var/spool/asterisk + ASTLOGDIR=/var/log/asterisk + ASTHEADERDIR=/opt/asterisk/include + ASTBINDIR=/opt/asterisk/bin + ASTSBINDIR=/opt/asterisk/sbin + ASTVARRUNDIR=/var/run/asterisk + ASTMANDIR=/opt/asterisk/man else ASTETCDIR=$(sysconfdir)/asterisk ASTLIBDIR=$(libdir)/asterisk @@ -250,7 +250,7 @@ endif ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include + ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include endif LIBEDIT=editline/libedit.a @@ -349,7 +349,7 @@ endif ifeq ($(OSARCH),SunOS) - LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib + LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib OBJS+=strcompat.o MENUSELECT_OBJS+=strcompat.o ASTLINK=