Fix common.gypi

KevinEady · KevinEady · commit 59f27dac9ae3 · 2020-10-10T02:26:47.000+02:00
diff --git a/common.gypi b/common.gypi
@@ -1,6 +1,6 @@
 {
   'variables': {
-    'NAPI_VERSION%': "<!(node -p \"process.env['NAPI_VERSION'] || process.versions.napi\")",
+    'NAPI_VERSION%': "<!(node -p \"process.versions.napi\")",
     'disable_deprecated': "<!(node -p \"process.env['npm_config_disable_deprecated']\")"
   },
   'conditions': [
@@ -15,7 +15,7 @@
       }
     }]
   ],
-  'include_dirs': ["<!@(node -p \"require('../').include\")"],
+  'include_dirs': ["<!(node -p \"require('../').include_dir\")"],
   'cflags': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ],
   'cflags_cc': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`'variables': {`
`3`		`- 'NAPI_VERSION%': "<!(node -p \"process.env['NAPI_VERSION'] \|\| process.versions.napi\")",`
	`3`	`+ 'NAPI_VERSION%': "<!(node -p \"process.versions.napi\")",`
`4`	`4`	`'disable_deprecated': "<!(node -p \"process.env['npm_config_disable_deprecated']\")"`
`5`	`5`	`},`
`6`	`6`	`'conditions': [`
`@@ -15,7 +15,7 @@`
`15`	`15`	`}`
`16`	`16`	`}]`
`17`	`17`	`],`
`18`		`- 'include_dirs': ["<!@(node -p \"require('../').include\")"],`
	`18`	`+ 'include_dirs': ["<!(node -p \"require('../').include_dir\")"],`
`19`	`19`	`'cflags': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ],`
`20`	`20`	`'cflags_cc': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ]`
`21`	`21`	`}`