mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-11-25 04:35:44 +00:00
Sun May 12 19:19:43 1996 Aaron Digulla <digulla@fh-konstanz.de>
* function.c: Use special function wildcard_expansion() for $(wildcard ) to allow Amiga wildcards The current directory on Amiga is "" instead of "."
This commit is contained in:
parent
efbe1b6411
commit
678b14fb7e
1 changed files with 16 additions and 2 deletions
18
function.c
18
function.c
|
@ -27,6 +27,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|||
#include <process.h>
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
#ifdef _AMIGA
|
||||
#include "amiga.h"
|
||||
#endif
|
||||
|
||||
static char *string_glob PARAMS ((char *line));
|
||||
|
||||
|
@ -342,10 +345,13 @@ expand_function (o, function, text, end)
|
|||
#ifndef VMS /* not supported for vms yet */
|
||||
case function_shell:
|
||||
{
|
||||
char **argv, **envp;
|
||||
char **argv;
|
||||
char *error_prefix;
|
||||
#ifndef _AMIGA
|
||||
char **envp;
|
||||
int pipedes[2];
|
||||
int pid;
|
||||
#endif
|
||||
|
||||
/* Expand the command line. */
|
||||
text = expand_argument (text, end);
|
||||
|
@ -991,8 +997,12 @@ expand_function (o, function, text, end)
|
|||
case function_wildcard:
|
||||
text = expand_argument (text, end);
|
||||
|
||||
#ifdef _AMIGA
|
||||
o = wildcard_expansion (text, o);
|
||||
#else
|
||||
p = string_glob (text);
|
||||
o = variable_buffer_output (o, p, strlen (p));
|
||||
#endif
|
||||
|
||||
free (text);
|
||||
break;
|
||||
|
@ -1210,8 +1220,12 @@ index argument");
|
|||
#ifdef VMS
|
||||
o = variable_buffer_output (o, "[]", 2);
|
||||
#else
|
||||
#ifndef _AMIGA
|
||||
o = variable_buffer_output (o, "./", 2);
|
||||
#endif
|
||||
#else
|
||||
/* o = o */; /* Just a nop... */
|
||||
#endif /* AMIGA */
|
||||
#endif /* !VMS */
|
||||
else
|
||||
/* The entire name is the basename. */
|
||||
o = variable_buffer_output (o, p2, len);
|
||||
|
|
Loading…
Reference in a new issue