Windows: Make application manifest available everywhere

packages/windows/assembly/NTMakefile

@@ -33,14 +33,6 @@ RELDIR=packages\windows\assembly
 
 !include ../../../windows/NTMakefile.w32
 
-!  if "$(CPU)"=="i386" || "$(CPU)"=="x86"
-MCPU=x86
-!  elseif "$(CPU)"=="AMD64"
-MCPU=amd64
-!  else
-!    error Unknown CPU
-!  endif
-
 # CODESIGN_PKT should be set to the public key token of the code
 # signing certificate in use.  You can use :
 #
@@ -104,7 +96,7 @@ ASMGSSDIR=$(ASMDIR)\Heimdal.GSSAPI
 ASMGSSVER=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
 ASMGSSMAN=$(ASMGSSNAME).manifest
 
-ASMGSSBINS=$(ASMGSSDIR)\libgssapi.dll
+ASMGSSBINS=$(ASMGSSDIR)\gssapi.dll
 
 $(ASMGSSDIR)\$(ASMGSSMAN).nohash: Heimdal.GSSAPI.manifest.in
 	$(SED)  -e "s,[@]name[@],$(ASMGSSNAME),g" \
@@ -145,8 +137,6 @@ test::
 # ----------------------------------------------------------------------
 # Application manifests
 
-APPMANIFEST=$(INCDIR)\Heimdal.Application.$(MCPU).manifest
-
 all:: $(APPMANIFEST)
 
 clean::

windows/NTMakefile.w32

@@ -59,6 +59,14 @@ SRC=$(MAKEDIR)\..\..\..
 !  error Cant determine source directory
 !endif
 
+!  if "$(CPU)"=="i386" || "$(CPU)"=="x86"
+MCPU=x86
+!  elseif "$(CPU)"=="AMD64"
+MCPU=amd64
+!  else
+!    error Unknown CPU
+!  endif
+
 !include "NTMakefile.config"
 
 #----------------------------------------------------------------
@@ -491,3 +499,5 @@ LIBWIND	    =$(LIBDIR)\libwind.lib
 
 ASMKRBNAME  =Heimdal.Kerberos
 ASMGSSNAME  =Heimdal.GSSAPI
+APPMANIFEST =$(INCDIR)\Heimdal.Application.$(MCPU).manifest
+