[Gsrc-commit] trunk r3057: fix librejs build

[Brandon Invergo]

------------------------------------------------------------
revno: 3057
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-27 22:59:46 +0100
message:
  fix librejs build
added:
  gnu/librejs/files/librejs-6.0.1-fix-makefile.diff 
librejs6.0.1fixmakef-20140827215914-v6957ovs048b9bkp-1
modified:
  gnu/librejs/Makefile           makefile-20120831164330-w68rtteotkacleie-2
  gnu/librejs/config.mk          config.mk-20121101110526-zcou3pe3uvcjuxew-1
  gnu/librejs/sha256sums         sha256sums-20120831164330-w68rtteotkacleie-3

=== modified file 'gnu/librejs/Makefile'
--- a/gnu/librejs/Makefile      2014-08-27 19:00:30 +0000
+++ b/gnu/librejs/Makefile      2014-08-27 21:59:46 +0000
@@ -33,10 +33,13 @@
 MASTER_SUBDIR = s/$(GARNAME)/distribution/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = 
+PATCHFILES = $(DISTNAME)-fix-makefile.diff
 
 BUILDDEPS = addon-sdk
 LIBDEPS =
 
+USE_AUTORECONF = y
+
 ######################################################################
 
 include ../../gar.lib/auto.mk

=== modified file 'gnu/librejs/config.mk'
--- a/gnu/librejs/config.mk     2012-11-01 22:50:49 +0000
+++ b/gnu/librejs/config.mk     2014-08-27 21:59:46 +0000
@@ -3,5 +3,5 @@
 # GSRC currently does not provide the Mozilla Addon-SDK, nor is it
 # ever likely to do so. You must provide the install location of
 # the SDK here (required to build LibreJS)
-CONFIGURE_OPTS ?= ADDON_SDK=/opt/addon-sdk
+CONFIGURE_OPTS ?= ADDON_SDK=/opt/mozilla-addon-sdk
 BUILD_OPTS ?=

=== added file 'gnu/librejs/files/librejs-6.0.1-fix-makefile.diff'
--- a/gnu/librejs/files/librejs-6.0.1-fix-makefile.diff 1970-01-01 00:00:00 
+0000
+++ b/gnu/librejs/files/librejs-6.0.1-fix-makefile.diff 2014-08-27 21:59:46 
+0000
@@ -0,0 +1,21 @@
+diff -x config.log -x config.status -ru work/librejs-6.0.1/Makefile.in 
work/librejs-6.0.1/Makefile.in
+--- work/librejs-6.0.1/Makefile.in     2014-08-26 05:33:58.000000000 +0100
++++ work/librejs-6.0.1/Makefile.in     2014-08-27 22:58:29.885003658 +0100
+@@ -18,7 +18,7 @@
+ SHELL := /bin/bash
+ 
+ DESTDIR =
+-ADDON_SDK = /opt/addon-sdk
++ADDON_SDK = @ADDON_SDK@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ prefix = @prefix@
+@@ -52,7 +52,7 @@
+ 
+ all: xpi
+ 
+-install: xpi info
++install: xpi
+       $(NORMAL_INSTALL)
+       $(INSTALL_DATA) librejs.xpi $(DESTDIR)$(extdir)/address@hidden
+       $(POST_INSTALL)

=== modified file 'gnu/librejs/sha256sums'
--- a/gnu/librejs/sha256sums    2014-08-27 19:00:30 +0000
+++ b/gnu/librejs/sha256sums    2014-08-27 21:59:46 +0000
@@ -1,1 +1,2 @@
 5ad138325818b6ba101709ebc190e2ce34ecbd8434325af97c2f78e71796060e  
download/librejs-6.0.1.tar.gz
+c12f840798710986885c01fdf40c5fac911c7341ba804b57253fb949622bed6b  
download/librejs-6.0.1-fix-makefile.diff