Thu Dec 26 13:12:06 2013 UTC ()
Use absolute path for seamonkey and firefox.


(ryoon)
diff -r1.22 -r1.23 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.22 -r1.23 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2013/12/15 13:54:37 1.22
+++ pkgsrc/www/firefox/mozilla-common.mk 2013/12/26 13:12:05 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.22 2013/12/15 13:54:37 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.23 2013/12/26 13:12:05 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by mail/thunderbird/Makefile 5# used by mail/thunderbird/Makefile
6# used by www/firefox/Makefile 6# used by www/firefox/Makefile
7# used by www/seamonkey/Makefile 7# used by www/seamonkey/Makefile
8 8
9GNU_CONFIGURE= yes 9GNU_CONFIGURE= yes
10USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 10USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
11USE_LANGUAGES+= c99 c++ 11USE_LANGUAGES+= c99 c++
12UNLIMIT_RESOURCES+= datasize 12UNLIMIT_RESOURCES+= datasize
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
@@ -96,27 +96,27 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} @@ -96,27 +96,27 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
96 96
97#BUILD_MAKE_FLAGS+= MOZ_WEBRTC_IN_LIBXUL=1 97#BUILD_MAKE_FLAGS+= MOZ_WEBRTC_IN_LIBXUL=1
98 98
99SUBST_CLASSES+= python 99SUBST_CLASSES+= python
100SUBST_STAGE.python= pre-configure 100SUBST_STAGE.python= pre-configure
101SUBST_MESSAGE.python= Fixing path to python. 101SUBST_MESSAGE.python= Fixing path to python.
102SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi 102SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi
103SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},' 103SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},'
104 104
105# Build outside ${WRKSRC} 105# Build outside ${WRKSRC}
106# Try to conflict with config/makefiles/xpidl/Makefile.in 106# Try to conflict with config/makefiles/xpidl/Makefile.in
107OBJDIR= ../build 107OBJDIR= ../build
108CONFIGURE_DIRS= ${OBJDIR} 108CONFIGURE_DIRS= ${OBJDIR}
109CONFIGURE_SCRIPT= ../mozilla-release/configure 109CONFIGURE_SCRIPT= ${WRKSRC}/configure
110 110
111PLIST_VARS+= sps vorbis tremor glskia throwwrapper 111PLIST_VARS+= sps vorbis tremor glskia throwwrapper
112 112
113.include "../../mk/endian.mk" 113.include "../../mk/endian.mk"
114.if ${MACHINE_ENDIAN} == "little" 114.if ${MACHINE_ENDIAN} == "little"
115PLIST.glskia= yes 115PLIST.glskia= yes
116.endif 116.endif
117 117
118.if ${MACHINE_ARCH} != "sparc64" 118.if ${MACHINE_ARCH} != "sparc64"
119# For some reasons the configure test for GCC bug 26905 still triggers on 119# For some reasons the configure test for GCC bug 26905 still triggers on
120# sparc64, which makes mozilla skip the installation of a few wrapper headers. 120# sparc64, which makes mozilla skip the installation of a few wrapper headers.
121# Other archs end up with one additional file in the SDK headers 121# Other archs end up with one additional file in the SDK headers
122PLIST.throwwrapper= yes 122PLIST.throwwrapper= yes