Bug 1541179 - Part 14: Update and tidy suite/app/ build files - Tidy up license file insertion. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 11 Apr 2019 20:30:44 +0200
changeset 32174 daf205c1956c
parent 32173 063f2d8423e2
child 32175 8e29ae45df19
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
Bug 1541179 - Part 14: Update and tidy suite/app/ build files - Tidy up license file insertion. r=frg a=frg
suite/app/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -1,16 +1,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
 AB_CD = $(MOZ_UI_LOCALE)
 
+LICENSE_TXT_FILE = $(topsrcdir)/comm/suite/installer/license.txt
+
 # Build a binary bootstrapping with XRE_main
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
 endif
@@ -34,22 +36,22 @@ ifeq ($(OS_ARCH),WINNT)
 # (this dependency should really be just for seamonkey.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
 EXTRA_DEPS += seamonkey.exe.manifest
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-libs::
+libs:: $(LICENSE_TXT_FILE)
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
-	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/comm/suite/installer/license.txt > $(DIST)/bin/license.txt
+	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $^ > $(DIST)/bin/license.txt
 else
-	$(INSTALL) $(IFLAGS1) $(topsrcdir)/comm/suite/installer/license.txt $(DIST)/bin/
+	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/
 endif
 
 ifneq ($(OS_ARCH),WINNT)
 
 ifdef COMPILE_ENVIRONMENT
 libs:: 
 	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif