[zaptel-commits] russell: trunk r1314 - in /trunk: ./ Makefile

zaptel-commits at lists.digium.com zaptel-commits at lists.digium.com
Tue Aug 15 14:44:47 MST 2006


Author: russell
Date: Tue Aug 15 16:44:46 2006
New Revision: 1314

URL: http://svn.digium.com/view/zaptel?rev=1314&view=rev
Log:
Merged revisions 1313 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1313 | russell | 2006-08-15 17:43:26 -0400 (Tue, 15 Aug 2006) | 4 lines

fix erroneous check to see if PWD was set before setting it in the Zaptel
Makefile.  It should always be set.  If not, it breaks the build when using
recursive calls to make. (issue #7733, tzafrir)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue Aug 15 16:44:46 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1314&r1=1313&r2=1314&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Aug 15 16:44:46 2006
@@ -11,9 +11,8 @@
 
 HOSTCC=gcc
 CC=gcc
-ifeq ($(PWD),)
 PWD=$(shell pwd)
-endif
+
 ifeq ($(DEB_HOST_GNU_TYPE),)
 UNAME_M:=$(shell uname -m)
 else



More information about the zaptel-commits mailing list