[mw-devel] MW3 r1370 - in trunk: . mozjs17.0.0

[arthur at sucs.org]

Author: arthur
Date: 2014-05-30 18:24:25 +0100 (Fri, 30 May 2014)
New Revision: 1370

Modified:
   trunk/Makefile.common
   trunk/mozjs17.0.0/Makefile
Log:
refix deb build


Modified: trunk/Makefile.common
===================================================================
--- trunk/Makefile.common	2014-05-30 15:39:19 UTC (rev 1369)
+++ trunk/Makefile.common	2014-05-30 17:24:25 UTC (rev 1370)
@@ -41,7 +41,7 @@
 
 ifeq ($(JSFLAGS),)
 	JSDIR=$(DEPTH)mozjs
-	JSFLAGS= -include $(JSDIR)/include/js-17.0/js/RequiredDefines.h -I/usr/include/nspr -I$(JSDIR)/include/js-17.0
+	JSFLAGS= -include $(JSDIR)/usr/include/js-17.0/js/RequiredDefines.h -I/usr/include/nspr -I$(JSDIR)/usr/include/js-17.0
 	LDFLAGS += -L$(JSDIR)/$(libdir)/
 	JSLIBS= -lmozjs-17.0
 	JSSCRIPTTYPE=JSScript

Modified: trunk/mozjs17.0.0/Makefile
===================================================================
--- trunk/mozjs17.0.0/Makefile	2014-05-30 15:39:19 UTC (rev 1369)
+++ trunk/mozjs17.0.0/Makefile	2014-05-30 17:24:25 UTC (rev 1370)
@@ -1,11 +1,19 @@
 .PHONY : all mozjs
 
+all: mozjs
+
+ifndef PWD
+mozjs:
+	$(MAKE) PWD=`cd .. ; pwd` $@
+else
+
 INSTALLDIR=$(PWD)/mozjs
 
-all: mozjs
-	
 mozjs:
-	cd js/src/ ; ./configure --enable-thread  --with-pthreads --prefix=/
+	echo "INSTALLDIR = $(INSTALLDIR)"
+	cd js/src/ ; ./configure --enable-thread  --with-pthreads --prefix=/usr
 	make -C js/src/
 	/usr/bin/printenv
 	make -C js/src/ install DESTDIR=$(INSTALLDIR)
+
+endif