diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-09-07 14:16:27 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-09-07 14:16:27 -0600 |
| commit | 09dd476a8ab6c1337ed0479ad6d6d0e63e38d35b (patch) | |
| tree | 5bc17beba1e8847d6f3b8301ae11bab5789a3328 /bin/win32/BINDInstall | |
| parent | 8dc48682f6d0e38c23f5832207823849031cfc00 (diff) | |
| download | bind9-09dd476a8ab6c1337ed0479ad6d6d0e63e38d35b.tar.gz | |
9.5.0a5
Diffstat (limited to 'bin/win32/BINDInstall')
| -rw-r--r-- | bin/win32/BINDInstall/BINDInstall.cpp | 2 | ||||
| -rw-r--r-- | bin/win32/BINDInstall/BINDInstall.mak | 5 | ||||
| -rw-r--r-- | bin/win32/BINDInstall/BINDInstallDlg.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp index eb27aa18..517f5192 100644 --- a/bin/win32/BINDInstall/BINDInstall.cpp +++ b/bin/win32/BINDInstall/BINDInstall.cpp @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: BINDInstall.cpp,v 1.4.18.1 2004/04/19 06:20:45 marka Exp $ */ +/* $Id: BINDInstall.cpp,v 1.5 2004/04/19 05:48:02 marka Exp $ */ /* * Copyright (c) 1999-2000 by Nortel Networks Corporation diff --git a/bin/win32/BINDInstall/BINDInstall.mak b/bin/win32/BINDInstall/BINDInstall.mak index 3393a57e..c814517c 100644 --- a/bin/win32/BINDInstall/BINDInstall.mak +++ b/bin/win32/BINDInstall/BINDInstall.mak @@ -56,7 +56,7 @@ _VC_MANIFEST_AUTO_RES= MT_SPECIAL_RETURN=0
MT_SPECIAL_SWITCH=
_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME). auto.manifest $(MT_SPECIAL_SWITCH) & \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
link $** /out:$@ $(LFLAGS)
@@ -78,8 +78,7 @@ if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 MT_SPECIAL_RETURN=0
MT_SPECIAL_SWITCH=
_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).
-auto.manifest $(MT_SPECIAL_SWITCH) & \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
link $** /out:$@ $(LFLAGS)
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index f5d48397..99000abf 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.cpp +++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: BINDInstallDlg.cpp,v 1.15.18.14 2007/06/27 01:12:17 marka Exp $ */ +/* $Id: BINDInstallDlg.cpp,v 1.33 2007/05/21 05:52:21 marka Exp $ */ /* * Copyright (c) 1999-2000 by Nortel Networks Corporation @@ -117,7 +117,7 @@ const FileData installFiles[] = #if _MSC_VER >= 1310 {"mfc71.dll", FileData::WinSystem, FileData::Critical, TRUE}, {"msvcr71.dll", FileData::WinSystem, FileData::Critical, TRUE}, -#elif _MSC_VER > 1200 && _MSC_VER < 1310 +#elif _MSC_VER > 1200 && _MSC_VER < {"mfc70.dll", FileData::WinSystem, FileData::Critical, TRUE}, {"msvcr70.dll", FileData::WinSystem, FileData::Critical, TRUE}, #endif |