nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 461322 - Don't give executable permissions to the various icons and text files that the app/Makefile.ins incautiously $(INSTALL), r=ted

Browse source
This commit is contained in:
Phil Ringnalda 2008-12-06 20:25:09 -08:00
parent 365d1edefd
commit cf77fa8222
2 changed files with 17 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
browser/app/Makefile.in
View file

@ -156,6 +156,8 @@ MOZ_WINCONSOLE = 0
endif endif
endif endif
# This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
# shouldn't get 755 perms need $(IFLAGS1) for either way of caling nsinstall.
NSDISTMODE = copy NSDISTMODE = copy
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
@ -296,7 +298,7 @@ ICON_FILES = \
$(NULL) $(NULL)
libs:: $(ICON_FILES) libs:: $(ICON_FILES)
$(INSTALL) $^ $(DIST)/bin/icons $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
install:: install::
$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
@ -304,9 +306,9 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs:: libs::
$(INSTALL) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
endif endif
export:: export::
@ -346,10 +348,10 @@ libs::
touch $(DIST)/bin/.autoreg touch $(DIST)/bin/.autoreg
libs:: $(srcdir)/profile/prefs.js libs:: $(srcdir)/profile/prefs.js
$(INSTALL) $^ $(DIST)/bin/defaults/profile $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
libs:: $(srcdir)/blocklist.xml libs:: $(srcdir)/blocklist.xml
$(INSTALL) $^ $(DIST)/bin $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
@ -408,7 +410,7 @@ libs::
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/LICENSE > $(DIST)/bin/LICENSE $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/LICENSE > $(DIST)/bin/LICENSE
else else
$(INSTALL) $(topsrcdir)/LICENSE $(DIST)/bin $(INSTALL) $(IFLAGS1) $(topsrcdir)/LICENSE $(DIST)/bin
endif endif
ifdef LIBXUL_SDK ifdef LIBXUL_SDK

14
xulrunner/app/Makefile.in
View file

@ -138,6 +138,8 @@ endif
endif endif
DEFINES += -DMOZ_WINCONSOLE=$(MOZ_WINCONSOLE) DEFINES += -DMOZ_WINCONSOLE=$(MOZ_WINCONSOLE)
# This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
# shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
NSDISTMODE = copy NSDISTMODE = copy
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
@ -230,7 +232,7 @@ ICON_FILES = \
$(NULL) $(NULL)
libs:: $(ICON_FILES) libs:: $(ICON_FILES)
$(SYSINSTALL) $^ $(DIST)/bin/icons $(INSTALL) ($IFLAGS1) $^ $(DIST)/bin/icons
install:: install::
$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
@ -238,9 +240,9 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs:: libs::
$(INSTALL) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
endif endif
# XXX applications would need to supply this file # XXX applications would need to supply this file
@ -299,5 +301,5 @@ endif
README_FILE = $(topsrcdir)/README.txt README_FILE = $(topsrcdir)/README.txt
libs:: libs::
$(SYSINSTALL) $(README_FILE) $(DIST)/bin $(INSTALL) $(IFLAGS1) $(README_FILE) $(DIST)/bin
$(SYSINSTALL) $(topsrcdir)/LICENSE $(DIST)/bin $(INSTALL) $(IFLAGS1) $(topsrcdir)/LICENSE $(DIST)/bin