Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

local changes; install into /usr/bin, deal with sh warnings, deal with obj.MACHINE, etc.

Browse Source
This commit is contained in:
cgd 1994-08-29 15:08:25 +00:00
parent ee36043f2b
commit e1a9c4fa17
8 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/crunch/Makefile.inc
View File

@ -1,2 +1,2 @@
# modify to taste
BINDIR?= /usr/local/bin
BINDIR?= /usr/bin

2
distrib/crunch/crunchgen/Makefile
View File

@ -5,6 +5,6 @@ CFLAGS+=-g -Wall
CLEANFILES+= crunched_skel.c
crunched_skel.c: crunched_main.c
${.CURDIR}/mkskel.sh ${.CURDIR}/crunched_main.c >crunched_skel.c
sh ${.CURDIR}/mkskel.sh ${.CURDIR}/crunched_main.c > crunched_skel.c
.include <bsd.prog.mk>

12
distrib/crunch/crunchgen/crunchgen.c
View File

@ -480,8 +480,13 @@ void fillin_program(prog_t *p)
sprintf(path, "%s/obj", p->srcdir);
if(is_dir(path))
p->objdir = strdup(path);
else
p->objdir = p->srcdir;
else {
sprintf(path, "%s/obj.%s", p->srcdir, MACHINE);
if(is_dir(path))
p->objdir = strdup(path);
else
p->objdir = p->srcdir;
}
}
if(p->srcdir) sprintf(path, "%s/Makefile", p->srcdir);
@ -539,6 +544,9 @@ void fillin_program_objs(prog_t *p, char *path)
while(fgets(line, MAXLINELEN, f)) {
if(strncmp(line, "OBJS= ", 6)) {
if (strcmp(line,
"sh: warning: running as root with dot in PATH\n") == 0)
continue;
fprintf(stderr, "make error: %s", line);
goterror = 1;
continue;

2
distrib/crunch/crunchide/crunchide.1
View File

@ -61,8 +61,6 @@ multiple component programs.
.Sh SEE ALSO
.Xr crunchgen 1 ,
.Xr ld 1
.Sh BUGS
Should have just used symorder -t where available.
.Sh AUTHOR
.Nm Crunch
was written by James da Silva <jds@cs.umd.edu>.

2
usr.bin/crunch/Makefile.inc
View File

@ -1,2 +1,2 @@
# modify to taste
BINDIR?= /usr/local/bin
BINDIR?= /usr/bin

2
usr.bin/crunch/crunchgen/Makefile
View File

@ -5,6 +5,6 @@ CFLAGS+=-g -Wall
CLEANFILES+= crunched_skel.c
crunched_skel.c: crunched_main.c
${.CURDIR}/mkskel.sh ${.CURDIR}/crunched_main.c >crunched_skel.c
sh ${.CURDIR}/mkskel.sh ${.CURDIR}/crunched_main.c > crunched_skel.c
.include <bsd.prog.mk>

12
usr.bin/crunch/crunchgen/crunchgen.c
View File

@ -480,8 +480,13 @@ void fillin_program(prog_t *p)
sprintf(path, "%s/obj", p->srcdir);
if(is_dir(path))
p->objdir = strdup(path);
else
p->objdir = p->srcdir;
else {
sprintf(path, "%s/obj.%s", p->srcdir, MACHINE);
if(is_dir(path))
p->objdir = strdup(path);
else
p->objdir = p->srcdir;
}
}
if(p->srcdir) sprintf(path, "%s/Makefile", p->srcdir);
@ -539,6 +544,9 @@ void fillin_program_objs(prog_t *p, char *path)
while(fgets(line, MAXLINELEN, f)) {
if(strncmp(line, "OBJS= ", 6)) {
if (strcmp(line,
"sh: warning: running as root with dot in PATH\n") == 0)
continue;
fprintf(stderr, "make error: %s", line);
goterror = 1;
continue;

2
usr.bin/crunch/crunchide/crunchide.1
View File

@ -61,8 +61,6 @@ multiple component programs.
.Sh SEE ALSO
.Xr crunchgen 1 ,
.Xr ld 1
.Sh BUGS
Should have just used symorder -t where available.
.Sh AUTHOR
.Nm Crunch
was written by James da Silva <jds@cs.umd.edu>.