contrib/js-1.5-rc6a+elinks.patch

   1 This quick'n'dirty patch enables relatively painless SpiderMonkey installation.
   2 See doc/ecmascript.txt for details.
   3
   4 diff -ru js-1.5-rc6a/src/config.mk js-1.5-rc6a+elinks/src/config.mk
   5 --- js-1.5-rc6a/src/config.mk   Sat Nov 15 01:10:55 2003
   6 +++ js-1.5-rc6a+elinks/src/config.mk    Wed Sep 22 16:32:12 2004
   7 @@ -37,10 +37,15 @@
   8  #
   9  # ***** END LICENSE BLOCK *****
  10
  11 +BUILD_OPT=1
  12 +ifndef PREFIX
  13 +PREFIX = /opt/spidermonkey
  14 +endif
  15 +
  16  ifdef JS_DIST
  17  DIST = $(JS_DIST)
  18  else
  19 -DIST = $(DEPTH)/../../dist/$(OBJDIR)
  20 +DIST = dist/
  21  endif
  22
  23  # Set os+release dependent make variables
  24 diff -ru js-1.5-rc6a/src/jsconfig.mk js-1.5-rc6a+elinks/src/jsconfig.mk
  25 --- js-1.5-rc6a/src/jsconfig.mk Sat Nov 15 01:10:56 2003
  26 +++ js-1.5-rc6a+elinks/src/jsconfig.mk  Wed Sep 22 16:34:28 2004
  27 @@ -104,8 +104,8 @@
  28         echo $(NSPR_VERSION) > $(NSPR_VERSIONFILE)
  29  endif
  30
  31 -SHIP_DIST  = $(MOZ_DEPTH)/dist/$(OBJDIR)
  32 -SHIP_DIR   = $(SHIP_DIST)/SHIP
  33 +SHIP_DIST  = $(DIST)
  34 +SHIP_DIR   = $(PREFIX)
  35
  36  SHIP_LIBS      = libjs.$(SO_SUFFIX) libjs.a
  37  ifdef JS_LIVECONNECT
  38 @@ -117,7 +117,7 @@
  39      SHIP_LIBS += jsj.dll jsj.lib
  40    endif
  41  endif
  42 -SHIP_LIBS     += $(LCJAR)
  43 +#SHIP_LIBS     += $(LCJAR)
  44  SHIP_LIBS     := $(addprefix $(SHIP_DIST)/lib/, $(SHIP_LIBS))
  45
  46  SHIP_INCS      = js*.h prmjtime.h resource.h *.msg *.tbl
  47 @@ -144,6 +144,14 @@
  48    JSREFJAR = jsref_dbg.jar
  49  endif
  50  endif
  51 +
  52 +install:
  53 +       mkdir -p $(SHIP_DIR)/$(LIBDIR)
  54 +       mkdir -p $(SHIP_DIR)/include
  55 +       mkdir -p $(SHIP_DIR)/bin
  56 +       cp $(SHIP_LIBS) $(SHIP_DIR)/$(LIBDIR)
  57 +       cp $(SHIP_INCS) $(SHIP_DIR)/include
  58 +       cp $(SHIP_BINS) $(SHIP_DIR)/bin
  59
  60  ship:
  61         mkdir -p $(SHIP_DIR)/$(LIBDIR)