Commit6f2f169

committed

Fix GNU make detection.

(The test 'make --version' with FreeBSD make (and potentially others)would just reinvoke make on the same Makefile, resulting in an infiniteloop.)

1 parentdb631de commit6f2f169Copy full SHA for 6f2f169

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@`
`13`	`13`
`14`	`14`	`allcheckinstallinstalldirsinstallcheckuninstalldepdependcleandistcleanmaintainer-clean:`
`15`	`15`	`@if! [-f GNUmakefile ];then\`
`16`		-echo"You need to run the\`configure' program first. See the file";\
`17`		-echo"\`INSTALL' for installation instructions.";\
	`16`	`+echo"You need to run the'configure' program first. See the file";\`
	`17`	`+echo"'INSTALL' for installation instructions.";\`
`18`	`18`	`false;\`
`19`	`19`	`fi`
`20`	`20`	`@IFS=':';\`
`21`	`21`	`fordirin$$PATH;do \`
`22`	`22`	`forprogin gmake gnumake make;do \`
`23`		`-if [-f$$dir/$$prog ]&& ($$dir/$$prog --version2>/dev/null\| grep GNU>/dev/null2>&1 );then \`
	`23`	`+if [-f$$dir/$$prog ]&& ($$dir/$$prog -f /dev/null --version2>/dev/null\| grep GNU>/dev/null2>&1 );then \`
`24`	`24`	`GMAKE=$$dir/$$prog;\`
`25`	`25`	`break 2;\`
`26`	`26`	`fi;\`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,16 @@`
`11`	`11`	`# GNUmakefile won't exist yet, so we catch that case as well.`
`12`	`12`
`13`	`13`
`14`		`-allinstallcleandepdependdistcleanmaintainer-clean:`
	`14`	`+allcheckinstallinstalldirsinstallcheckuninstalldepdependcleandistcleanmaintainer-clean:`
`15`	`15`	`@if! [-f GNUmakefile ];then\`
`16`		-echo"You need to run the\`configure' program first. See the file";\
`17`		-echo"\`INSTALL' for installation instructions.";\
	`16`	`+echo"You need to run the'configure' program first. See the file";\`
	`17`	`+echo"'INSTALL' for installation instructions.";\`
`18`	`18`	`false;\`
`19`	`19`	`fi`
`20`	`20`	`@IFS=':';\`
`21`	`21`	`fordirin$$PATH;do \`
`22`	`22`	`forprogin gmake gnumake make;do \`
`23`		`-if [-f$$dir/$$prog ]&& ($$dir/$$prog --version\| grep GNU>/dev/null2>&1 );then \`
	`23`	`+if [-f$$dir/$$prog ]&& ($$dir/$$prog -f /dev/null --version2>/dev/null\| grep GNU>/dev/null2>&1 );then \`
`24`	`24`	`GMAKE=$$dir/$$prog;\`
`25`	`25`	`break 2;\`
`26`	`26`	`fi;\`

Comments

(0)