|
@@ -0,0 +1,30 @@
|
|
|
|
+# HG changeset patch
|
|
|
|
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
|
+# Date 1521647885 14400
|
|
|
|
+# Node ID f61075a4b4d0a926562b60e47c23fcefc7963852
|
|
|
|
+# Parent 76aa0354eec22939af768ed44438ec3d0ad63da0
|
|
|
|
+Bug 1448543 - Copy SeaMonkey binaries directly from dist target. r=ewong a=frg
|
|
|
|
+Port Bug 1255485 [Build binaries directly in their FINAL_TARGET location] to SeaMonkey.
|
|
|
|
+
|
|
|
|
+diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
|
|
|
|
+--- a/suite/app/Makefile.in
|
|
|
|
++++ b/suite/app/Makefile.in
|
|
|
|
+@@ -54,17 +54,17 @@ ifeq ($(OS_ARCH),WINNT)
|
|
|
|
+ else
|
|
|
|
+ $(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)
|
|
|
|
++ cp -p $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
|
|
|
|
+ endif
|
|
|
|
+
|
|
|
|
+ endif
|
|
|
|
+
|
|
|
|
+ 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" \
|