Bug 513900 - executable permissions for data files (port bug 461322 to SeaMonkey). r=Callek
authorEdmund Wong <ewong@pw-wspx.org>
Sun, 04 Sep 2011 19:34:00 +0200
changeset 9132 618b5c2caf6c7857f497b39c85e0e072923bf552
parent 9131 7e389dc6008e068efc63347c3696830a65d22be6
child 9133 ffee873dfdbda7801015927aeb6d9f38461e1b96
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs513900, 461322
Bug 513900 - executable permissions for data files (port bug 461322 to SeaMonkey). r=Callek
suite/app/Makefile.in
suite/branding/nightly/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -210,17 +210,17 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
 LIBS += -lphexlib
 endif
 
 libs::
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
 else
-	$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
+	$(INSTALL) $(IFLAGS1) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
 endif
 
 libs:: blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
 ifdef ENABLE_TESTS
 # XXX This is a hack to ensure that we get the right xpcshell.ini for our tests
 # and that we can share the core mozilla-central xpcshell.ini.
--- a/suite/branding/nightly/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -87,32 +87,32 @@ DESKTOP_ICONS += \
 	script-file \
 	xml-file \
 	xul-file \
 	$(NULL)
 endif
 
 ifeq ($(ICON_DIR),gtk)
 libs:: icons/gtk/seamonkey.png
-	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
+	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 
 install:: icons/gtk/seamonkey.png
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
+	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
 
 GARBAGE	+= $(DIST)/bin/chrome/icons/default/seamonkey.png
 
 DESKTOP_ICONS += default
 DESKTOP_ICONS_SMALL = $(patsubst %,%16,$(DESKTOP_ICONS))
 DESKTOP_ICONS_LARGE = $(patsubst %,%48,$(DESKTOP_ICONS))
 endif
 
 DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL) $(DESKTOP_ICONS_LARGE))
 
 libs:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
-	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
+	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 
 install:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
 
 GARBAGE	+= $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES))
 endif
 
 include $(topsrcdir)/config/rules.mk