From owner-freebsd-gecko@FreeBSD.ORG  Thu Dec 18 14:38:04 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7E6BCBCC
 for <freebsd-gecko@freebsd.org>; Thu, 18 Dec 2014 14:38:04 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 12BA42191
 for <freebsd-gecko@freebsd.org>; Thu, 18 Dec 2014 14:38:03 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sBIEc0Gw049528
 for <freebsd-gecko@freebsd.org>; Thu, 18 Dec 2014 14:38:00 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sBIEbtBh049175
 for freebsd-gecko@freebsd.org; Thu, 18 Dec 2014 14:37:55 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Thu, 18 Dec 2014 14:37:55 GMT
Message-Id: <201412181437.sBIEbtBh049175@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1795 - trunk/Mk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reply-To: freebsd-gecko@freebsd.org
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Dec 2014 14:38:04 -0000

Author: jbeich
Date: Thu Dec 18 14:37:55 2014
New Revision: 1795

Log:
fix SeaMonkey install path after Mozilla bug 1074034

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Thu Dec 18 10:14:30 2014	(r1794)
+++ trunk/Mk/bsd.gecko.mk	Thu Dec 18 14:37:55 2014	(r1795)
@@ -529,10 +529,9 @@
 	@if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \
 		${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 			${WRKSRC}/config/baseconfig.mk; \
-	else \
-		${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-			${WRKSRC}/config/autoconf.mk.in; \
 	fi
+	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+			${MOZSRC}/config/baseconfig.mk
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${MOZSRC}/build/unix/run-mozilla.sh