eaf2dfcd99
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=32d023277b80cb2ab9346f1ea11174af
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -223,22 +223,16 @@ endif
|
|
ifdef DEBUG
|
|
RCFLAGS += -DDEBUG
|
|
endif
|
|
RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
|
|
endif
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
-DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
|
|
-
|
|
-ifdef MOZILLA_OFFICIAL
|
|
-DEFINES += -DMOZILLA_OFFICIAL
|
|
-endif
|
|
-
|
|
ifdef BUILD_STATIC_LIBS
|
|
include $(topsrcdir)/config/static-rules.mk
|
|
|
|
DEFINES += -DIMPL_XREAPI
|
|
endif
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
|
|
LIBS += -lphexlib
|
|
@@ -277,16 +271,22 @@ install:: $(MOZ_APP_NAME)
|
|
|
|
GARBAGE += $(MOZ_APP_NAME)
|
|
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
|
|
|
|
endif
|
|
|
|
endif # LIBXUL_SDK
|
|
|
|
+ifdef MOZILLA_OFFICIAL
|
|
+DEFINES += -DMOZILLA_OFFICIAL
|
|
+endif
|
|
+
|
|
+DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
|
|
+
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
libs::
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
|
|
endif
|