edink Sun Mar 4 00:41:16 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/win32/build Makefile
Log:
Check that manifest file exists before trying to embed it
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.5&r2=1.35.2.1.2.6&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.5
php-src/win32/build/Makefile:1.35.2.1.2.6
--- php-src/win32/build/Makefile:1.35.2.1.2.5 Sat Jan 13 03:32:28 2007
+++ php-src/win32/build/Makefile Sun Mar 4 00:41:16 2007
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.35.2.1.2.5 2007/01/13 03:32:28 fmk Exp $
+# $Id: Makefile,v 1.35.2.1.2.6 2007/03/04 00:41:16 edink Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -59,8 +59,8 @@
_VC_MANIFEST_EMBED_EXE=
_VC_MANIFEST_EMBED_DLL=
!else
-_VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED]
-outputresource:$@;1
-_VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED]
-outputresource:$@;2
+_VC_MANIFEST_EMBED_EXE= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest
[EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest
[EMAIL PROTECTED] -outputresource:$@;2
!endif
$(PHPDLL_RES): win32\build\template.rc
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
