[mw-devel] MW3 r1366 - in trunk: . debian-template mozjs17.0.0

[arthur at sucs.org]

Author: arthur
Date: 2014-05-30 11:03:29 +0100 (Fri, 30 May 2014)
New Revision: 1366

Modified:
   trunk/Makefile
   trunk/debian-template/mw3.dirs
   trunk/debian-template/mw3.install
   trunk/mozjs17.0.0/Makefile
Log:
Tweaks to make the deb build, and include the custom libmozjs


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2014-05-30 09:00:28 UTC (rev 1365)
+++ trunk/Makefile	2014-05-30 10:03:29 UTC (rev 1366)
@@ -2,6 +2,7 @@
 include Makefile.common
 
 build:
+	$(MAKE) -C mozjs17.0.0
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
 
@@ -12,6 +13,7 @@
 	cp -a $(INSTALLFILES) $(DESTDIR)$(libdir)/mw/
 	install -d $(DESTDIR)$(initddir)
 	install mwserv.init $(DESTDIR)$(initddir)/mwserv
+	install mozjs/lib/libmozjs-17.0.so $(DESTDIR)$(libdir)
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
 

Modified: trunk/debian-template/mw3.dirs
===================================================================
--- trunk/debian-template/mw3.dirs	2014-05-30 09:00:28 UTC (rev 1365)
+++ trunk/debian-template/mw3.dirs	2014-05-30 10:03:29 UTC (rev 1366)
@@ -1,4 +1,5 @@
 usr/bin
+usr/lib
 usr/lib/mw
 var/log/mw
 var/lib/mw

Modified: trunk/debian-template/mw3.install
===================================================================
--- trunk/debian-template/mw3.install	2014-05-30 09:00:28 UTC (rev 1365)
+++ trunk/debian-template/mw3.install	2014-05-30 10:03:29 UTC (rev 1366)
@@ -1,3 +1,4 @@
+usr/lib/libmozjs*
 usr/bin/mw
 usr/lib/mw/*
 usr/share/locale/*

Modified: trunk/mozjs17.0.0/Makefile
===================================================================
--- trunk/mozjs17.0.0/Makefile	2014-05-30 09:00:28 UTC (rev 1365)
+++ trunk/mozjs17.0.0/Makefile	2014-05-30 10:03:29 UTC (rev 1366)
@@ -3,8 +3,6 @@
 all: mozjs
 	
 mozjs:
-	pushd js/src/
-	configure --enable-thread  --with-pthreads --with-system-nspr --prefix ../../../mozjs
-	make
-	make install
-	popd
+	cd js/src/ ; ./configure --enable-thread  --with-pthreads --prefix ../../../mozjs
+	make -C js/src/
+	make -C js/src/ install