Re: [Bug-librejs] patch to support non-standard installs

[Loic J. Duros]

Brandon Invergo <address@hidden> writes:

Hello Brandon:

As always, thanks for taking the time to provide a patch for this.
I'm starting to understand better GNU Make (thanks to the manual) and
it's great to be able to build LibreJS along with the documentation with
makefiles and configure!

Also, I might bug you in the future for questions, especially with GNU
IceCat which has a _huge_ number of makefile.in files and does a very
complex use of autoconf (at least for me!)

Loic


> Oops, I forgot to attach the patch. Here it is.
>
> Also, if you run autoconf and there's still no mention of CFX_ARGS in
> configure, run autoreconf -fvi instead.
>
> -brandon 
>
>
> --- Makefile.in 2012-11-02 10:18:21.533753077 +0100
> +++ Makefile.in       2012-11-01 23:39:24.000000000 +0100
> @@ -45,6 +45,7 @@
>  the menu in Tools > Add-ons and click enable where you see LibreJS. \
>  "
>  
> +CFX_ARGS =
>  
>  all: xpi
>  
> @@ -99,7 +100,7 @@
>  xpi: librejs.xpi
>  
>  librejs.xpi:
> -     cd $(ADDON_SDK) && source bin/activate && cd - && cfx xpi
> +     cd $(ADDON_SDK) && source bin/activate && cd - && cfx $(CFX_ARGS) xpi
>  
>  doc/librejs.info: $(srcdir)/doc/librejs.texi
>       $(MAKEINFO) -o $(srcdir)/doc/librejs.info $(srcdir)/doc/librejs.texi
>
> --- configure.ac        2012-11-02 12:10:59.928024855 +0100
> +++ configure.ac        2012-11-02 12:13:06.998042341 +0100
> @@ -4,4 +4,6 @@
>  AC_PATH_PROG([MAKEINFO], makeinfo)
>  AC_PATH_PROG([TEXI2DVI], texi2dvi)
>  AC_PATH_PROG([TEXI2PDF], texi2pdf)
> -AC_ARG_VAR([ADDON_SDK], [location of the Mozilla addon-sdk])
> + 
> +AC_ARG_VAR([ADDON_SDK], [location of the Mozilla addon-sdk 
> (default=/opt/addon-sdk)])
> +AC_ARG_VAR([CFX_ARGS], [build arguments to pass to cfx])
>
>  AC_CONFIG_FILES([Makefile])
>
>  AC_OUTPUT