From: Jeffrey Altman Date: Mon, 13 Aug 2007 03:13:28 +0000 (+0000) Subject: DEVEL15-windows-remove-is5-20070812 X-Git-Tag: openafs-devel-1_5_23~36 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=feda1c6a3b318999a315fee050634799414bf054;p=packages%2Fo%2Fopenafs.git DEVEL15-windows-remove-is5-20070812 remove last trace of InstallShield5 from build rules (cherry picked from commit c677b79931efb672a439993f32571c53ce17c56e) --- diff --git a/src/NTMakefile b/src/NTMakefile index dcb65105b..1904d7d72 100644 --- a/src/NTMakefile +++ b/src/NTMakefile @@ -605,8 +605,6 @@ finale: extra install: finale -# InstallShield dependencies - # Clean target for obj tree clean: nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" install @@ -653,23 +651,11 @@ wix: loopback $(NTMAKE) $(CD) ..\..\..\.. -InstallShield5: - echo ***** afs_setup_utils - $(DOCD) $(SRC)\WINNT\afs_setup_utils - $(CD) $(SRC)\WINNT\afs_setup_utils - $(NTMAKE) - $(CD) ..\..\.. - - $(DOCD) $(SRC)\WINNT\install\$@ - $(CD) $(SRC)\WINNT\install\$@ - $(NTMAKE) - $(CD) ..\..\..\.. - -media: install InstallShield5 NSIS wix +media: install NSIS wix install-nsis: install NSIS install-wix: install wix -install-is5: install InstallShield5 +