- Avoid using command execution to fill variables, they would be executed

  for all targets which is not needed

Suggested by:	'the eagle eye' kris

1 files changed, 5 insertions, 8 deletions

diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile
index ff67227dd559..3543309c6206 100644
--- a/lang/spidermonkey/Makefile
+++ b/lang/spidermonkey/Makefile
@@ -25,23 +25,20 @@ INSTALLS_SHLIB=	YES
 BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
 .endif
 
-JS_ARCH:=	`uname -s``uname -r`
-JS_HEADERS!=	${GREP} '\.h$$' ${MASTERDIR}/pkg-plist | ${SED} 'sX^include/XX'
-
 post-extract:
 	${MV} ${WRKDIR}/js/src ${WRKSRC} && \
 	${RM} -rf js && \
 	${CP} ${WRKSRC}/config/Linux_All.mk \
-		${WRKSRC}/config/${JS_ARCH}.mk && \
+		${WRKSRC}/config/`uname -s``uname -r`.mk && \
 	${CP} ${WRKSRC}/Makefile.ref ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${JS_ARCH}_DBG.OBJ/js \
+	${INSTALL_PROGRAM} ${WRKSRC}/`uname -s``uname -r`_DBG.OBJ/js \
 		${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${JS_ARCH}_DBG.OBJ/libjs.so \
+	${INSTALL_PROGRAM} ${WRKSRC}/`uname -s``uname -r`_DBG.OBJ/libjs.so \
 		${PREFIX}/lib
-	${CP} ${WRKSRC}/${JS_ARCH}_DBG.OBJ/jsautocfg.h ${WRKSRC}
-.for jsh in ${JS_HEADERS}
+	${CP} ${WRKSRC}/`uname -s``uname -r`_DBG.OBJ/jsautocfg.h ${WRKSRC}
+.for jsh in jsapi.h jsautocfg.h jscompat.h jslong.h jsosdep.h jsotypes.h jspubtd.h jstypes.h
 	@${INSTALL_DATA} ${WRKSRC}/${jsh} ${PREFIX}/include/
 .endfor