more forgiving when Makefile not found

Author: bobzhang

jscomp/common/js_config.ml

@@ -61,7 +61,7 @@ let diagnose = ref false
 let get_diagnose () = !diagnose
 let set_diagnose b = diagnose := b
 
-let (//) = Filename.concat
+let (//) = Filname.concat
 
 (* let get_packages_info () = !packages_info *)
 

scripts/install.js

@@ -155,9 +155,13 @@ function non_windows_npm_release() {
         child_process.execSync(make + " libs && " + make + " install", root_dir_config)
     } else {
         tryToProvideOCamlCompiler()
-        if(process.env.BS_TRAVIS_CI){
+        if(process.env.BS_TRAVIS_CI === "1"){
             console.log('Enforcing snapshot in CI mode')
-            child_process.execSync("make -C jscomp force-snapshotml", root_dir_config)
+            if(fs.existsSync(path.join(root_dir,'jscomp','Makefile'))){
+                child_process.execSync("make -C jscomp force-snapshotml", root_dir_config)
+            } else {
+                console.log("jscomp/Makefile is missing")
+            }            
         }
         child_process.execSync(make + " world && " + make + " install", root_dir_config)
     }