Bug 594338 - -lmozjs is not available in latest xulrunner SDK... but still present in mozilla-js.pc.in. r=khuey a=approval2.0
authorOleg Romashin <romaxa@gmail.com>
Tue, 14 Sep 2010 12:02:50 -0700
changeset 53806 045bfb95fe6a38c133d563ce48274deabfb28cd8
parent 53805 5f2250cb58c9eb1aa0d3f5515931f640152f2c1d
child 53807 e80ae0ee06d79b6d18efc67c3a2fea5d5f6b4911
push id15705
push userromaxa@gmail.com
push dateTue, 14 Sep 2010 19:31:41 +0000
treeherdermozilla-central@e67204601bc4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, approval2
bugs594338
milestone2.0b7pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 594338 - -lmozjs is not available in latest xulrunner SDK... but still present in mozilla-js.pc.in. r=khuey a=approval2.0
xulrunner/installer/Makefile.in
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -122,19 +122,19 @@ endif
 	-e "s|%idldir%|$(idldir)|" \
 	-e "s|%sdkdir%|$(sdkdir)|" \
 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
-	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
+	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \
 	-e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \
-	-e "s|%MOZ_JS_LINK%|$(MOZ_JS_LINK)|" \
+	-e "s|%MOZ_JS_LINK%|$(MOZ_JS_LINK)|" > $@
 	chmod 644 $@
 
 install:: $(pkg_config_files)
 	@echo pkg_config_file: $(pkg_config_files)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
 
 GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files)