diff --git a/Makefile b/Makefile
index 8d6fed570..21161a2b7 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,15 @@ ifneq (,$(findstring Darwin,$(UNAME_S)))
 NATIVE := native_macos.ini
 CROSS := cross_unix.ini
 else
+ifneq (,$(findstring BSD, $(UNAME_S)))
+NATIVE := native_unix.ini 
+CROSS := cross_unix.ini
+else
 NATIVE := native.ini
 CROSS := cross.ini
 endif
 endif
+endif
 
 export LM_LICENSE_FILE ?= $(WRAP)/license.dat
 export NINJA_STATUS := [%p %f/%t] 
diff --git a/meson.build b/meson.build
index e9d13e5c3..ee1cfd78d 100644
--- a/meson.build
+++ b/meson.build
@@ -224,9 +224,6 @@ pokeplatinum_nds = custom_target('pokeplatinum.us.nds',
         nitrofs_files # Make sure this is always listed last
     ],
     command : [
-        'sh', '-c',
-        '"$@" && @INPUT6@ @OUTPUT0@ --secure-crc 0xF8B8 --game-code CPUE',
-        '--',
         makerom_exe,
         '-DTITLE_NAME=POKEMON PL',
         '-DBNR=@INPUT1@',
@@ -235,7 +232,9 @@ pokeplatinum_nds = custom_target('pokeplatinum.us.nds',
         '-DARM7_DEFS=@INPUT5@',
         '@INPUT3@',
         '@OUTPUT0@',
-        '@OUTPUT1@'
+        '@OUTPUT1@',
+        '&&','sh', '-c',
+        '@INPUT6@ @OUTPUT0@ --secure-crc 0xF8B8 --game-code CPUE'
     ],
     build_by_default: true
 )
diff --git a/res/text/meson.build b/res/text/meson.build
index f0bba3c1d..618a40b9f 100644
--- a/res/text/meson.build
+++ b/res/text/meson.build
@@ -723,9 +723,7 @@ gmm_header_dir = custom_target('gmm_header_dir',
     capture: true,
     output: 'gmm_header_dir',
     command: [
-        'sh', '-c', '"$@"',
-        '--',
-        'mkdir', '-p', gmm_header_target
+        'sh','-c' , 'mkdir -p ' + gmm_header_target
     ]
 )