diff --git a/application/basilisk/app/Makefile.in b/application/basilisk/app/Makefile.in index 706ca5931..4978e3dd4 100644 --- a/application/basilisk/app/Makefile.in +++ b/application/basilisk/app/Makefile.in @@ -23,6 +23,13 @@ NSDISTMODE = copy include $(topsrcdir)/config/config.mk +ifeq ($(OS_ARCH),WINNT) +# Rebuild firefox.exe if the manifest changes - it's included by splash.rc. +# (this dependency should really be just for firefox.exe, not other targets) +# Note the manifest file exists in the tree, so we use the explicit filename +# here. +EXTRA_DEPS += centaury.exe.manifest +endif PROGRAMS_DEST = $(DIST)/bin diff --git a/application/basilisk/app/basilisk.exe.manifest b/application/basilisk/app/centaury.exe.manifest similarity index 94% rename from application/basilisk/app/basilisk.exe.manifest rename to application/basilisk/app/centaury.exe.manifest index 079e15b58..d57f2d2a2 100644 --- a/application/basilisk/app/basilisk.exe.manifest +++ b/application/basilisk/app/centaury.exe.manifest @@ -3,7 +3,7 @@ Firefox @@ -37,6 +37,7 @@ + diff --git a/application/basilisk/app/splash.rc b/application/basilisk/app/splash.rc index a5d418e81..d5c92c0e7 100644 --- a/application/basilisk/app/splash.rc +++ b/application/basilisk/app/splash.rc @@ -6,6 +6,8 @@ #include #include "nsNativeAppSupportWin.h" +1 24 "centaury.exe.manifest" + IDI_APPICON ICON FIREFOX_ICO IDI_DOCUMENT ICON DOCUMENT_ICO IDI_APPLICATION ICON FIREFOX_ICO diff --git a/application/palemoon/app/Makefile.in b/application/palemoon/app/Makefile.in index c3fa702fb..e5b12e613 100644 --- a/application/palemoon/app/Makefile.in +++ b/application/palemoon/app/Makefile.in @@ -33,6 +33,12 @@ NSDISTMODE = copy include $(topsrcdir)/config/config.mk +ifeq ($(OS_ARCH),WINNT) +# Rebuild firefox.exe if the manifest changes - it's included by splash.rc. +# (this dependency should really be just for firefox.exe, not other targets) +EXTRA_DEPS += $(PROGRAM).manifest +endif + PROGRAMS_DEST = $(DIST)/bin include $(topsrcdir)/config/rules.mk diff --git a/application/palemoon/app/palemoon.exe.manifest b/application/palemoon/app/mypal.exe.manifest similarity index 94% rename from application/palemoon/app/palemoon.exe.manifest rename to application/palemoon/app/mypal.exe.manifest index 465effa44..211b4d59c 100644 --- a/application/palemoon/app/palemoon.exe.manifest +++ b/application/palemoon/app/mypal.exe.manifest @@ -1,48 +1,48 @@ - - - -Pale Moon - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - + + + +Pale Moon + + + + + + + + + + + + + + + True/PM + + + + + + + + + + + + + + + + + diff --git a/application/palemoon/app/splash.rc b/application/palemoon/app/splash.rc index a5d418e81..e3676548a 100644 --- a/application/palemoon/app/splash.rc +++ b/application/palemoon/app/splash.rc @@ -6,6 +6,8 @@ #include #include "nsNativeAppSupportWin.h" +1 24 "mypal.exe.manifest" + IDI_APPICON ICON FIREFOX_ICO IDI_DOCUMENT ICON DOCUMENT_ICO IDI_APPLICATION ICON FIREFOX_ICO