Attachment 17212 Details for Bug 31304 – file.diff

[patch] file.diff

file.diff (text/plain), 2.42 KB, created by gunther on 2001-10-15 23:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gunther

Created: 2001-10-15 23:00:01 UTC

Size: 2.42 KB

patch

obsolete

>*** crunchgen.c~        Sun Aug 19 05:41:57 2001
>--- crunchgen.c Mon Oct 15 16:35:43 2001
>***************
>*** 631,638 ****
>                snprintf(line, MAXLINELEN, "Using %s for %s", path, p->name);
>                status(line);
>        } else
>!               if (p->srcdir)
>!                       snprintf(path, sizeof(path), "%s/Makefile", p->srcdir);
>        if (!p->objs && p->srcdir && is_nonempty_file(path))
>                fillin_program_objs(p, path);
>  
>--- 631,639 ----
>                snprintf(line, MAXLINELEN, "Using %s for %s", path, p->name);
>                status(line);
>        } else
>!               if (p->realsrcdir)
>!                       snprintf(path, sizeof(path), "%s/Makefile",
>!                                p->realsrcdir);
>        if (!p->objs && p->srcdir && is_nonempty_file(path))
>                fillin_program_objs(p, path);
>  
>***************
>*** 686,700 ****
>        fprintf(f, ".endif\n");
>        fprintf(f, "loop:\n\t@echo 'OBJS= '${%s}\n", objvar);
>  
>!       fprintf(f, "crunchgen_objs:\n\t@make -f %s $(BUILDOPTS) $(%s_OPTS)",
>!           tempfname, p->ident);
>        for (s = p->buildopts; s != NULL; s = s->next)
>                fprintf(f, " %s", s->str);
>        fprintf(f, " loop\n");
>  
>        fclose(f);
>  
>!       snprintf(line, MAXLINELEN, "make -f %s crunchgen_objs 2>&1", tempfname);
>        if ((f = popen(line, "r")) == NULL) {
>                warn("submake pipe");
>                goterror = 1;
>--- 687,715 ----
>        fprintf(f, ".endif\n");
>        fprintf(f, "loop:\n\t@echo 'OBJS= '${%s}\n", objvar);
>  
>!       fprintf(f, "crunchgen_objs:\n\t@");
>! 
>!       /* assure that we run this make file in the source directory */
>!       if(p->realsrcdir) {
>!         fprintf(f, "cd %s;", p->realsrcdir);
>!       }
>! 
>!       fprintf(f, "make -f %s $(BUILDOPTS) $(%s_OPTS)", tempfname, p->ident);
>        for (s = p->buildopts; s != NULL; s = s->next)
>                fprintf(f, " %s", s->str);
>        fprintf(f, " loop\n");
>  
>        fclose(f);
>  
>!       /* assure that we run this make file in the source directory */
>!       if(p->srcdir) {
>!         snprintf(line, MAXLINELEN, "cd %s ; make -f %s crunchgen_objs 2>&1", 
>!                  p->srcdir, tempfname);
>!       } 
>!       else
>!         snprintf(line, MAXLINELEN, "make -f %s crunchgen_objs 2>&1", 
>!                  tempfname);
>!         
>        if ((f = popen(line, "r")) == NULL) {
>                warn("submake pipe");
>                goterror = 1;

Actions: View | Diff

Attachments on bug 31304: 17212