Bug 1541179 - Part 4: Update and tidy suite/app/ build files. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 11 Apr 2019 20:30:43 +0200
changeset 32164 d817aac0e9a6
parent 32163 9371aae01260
child 32165 1315e3ad4fec
push id183
push userfrgrahl@gmx.net
push dateThu, 11 Apr 2019 18:31:37 +0000
treeherdercomm-esr60@8e29ae45df19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1541179, 910781
Bug 1541179 - Part 4: Update and tidy suite/app/ build files. r=frg a=frg Port Bug 910781 [add support for FINAL_TARGET_FILES].
suite/app/Makefile.in
suite/app/moz.build
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -55,19 +55,16 @@ endif
 
 ifneq ($(OS_ARCH),WINNT)
 
 libs:: 
 	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 
 endif
 
-libs:: blocklist.xml
-	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
-
 ifneq (,$(filter-out WINNT Darwin,$(OS_ARCH)))
 $(MOZ_APP_NAME).1: seamonkey.man.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
 	@sed -e "s|\@bindir\@|$(bindir)|g" -e "s|\@mozappdir\@|$(mozappdir)|g" \
 		-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|g" \
 		-e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|g" \
 		-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|g" < $< > $@
 
 libs:: $(MOZ_APP_NAME).1
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -71,10 +71,11 @@ if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERR
     ] + [
         '-mno-sse', '-mno-sse2', '-mfpmath=387',
     ]
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 DisableStlWrapping()
 
+FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults += ['permissions']