summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/as/Makefile6
-rw-r--r--gnu/usr.bin/binutils/gdb/Makefile20
-rw-r--r--gnu/usr.bin/cc/Makefile.inc6
-rw-r--r--gnu/usr.bin/cvs/Makefile.inc4
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile20
-rw-r--r--gnu/usr.bin/groff/Makefile.cfg14
-rw-r--r--gnu/usr.bin/man/lib/Makefile4
-rw-r--r--gnu/usr.bin/man/man/Makefile10
-rw-r--r--gnu/usr.bin/man/manpath/Makefile10
-rw-r--r--gnu/usr.bin/perl/usub/Makefile4
-rw-r--r--gnu/usr.bin/rcs/Makefile.inc4
-rw-r--r--gnu/usr.bin/send-pr/Makefile2
-rw-r--r--gnu/usr.bin/texinfo/doc/Makefile4
13 files changed, 52 insertions, 56 deletions
diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile
index 50e4ac8..908501d 100644
--- a/gnu/usr.bin/as/Makefile
+++ b/gnu/usr.bin/as/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 6.1 (Berkeley) 3/3/91
-# $Id: Makefile,v 1.8 1995/05/30 04:45:55 rgrimes Exp $
+# $Id: Makefile,v 1.9 1995/09/22 14:14:12 phk Exp $
.include "config/Makefile.$(MACHINE)"
@@ -13,9 +13,7 @@ gas_target=$(MACHINE)
gas_objformat=aout
.endif
-.if exists(${.CURDIR}/obj)
-ADDINCLUDE=-I${.CURDIR}/obj
-.endif
+ADDINCLUDE=-I${.OBJDIR}
PROG= as
SRCS+= app.c as.c atof-generic.c bignum-copy.c \
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 942a967..716789e 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id: Makefile,v 1.12 1996/05/07 23:15:24 wosch Exp $
PROG = gdb
BINDIR= /usr/bin
@@ -50,25 +50,25 @@ CFLAGS+= -I$(.CURDIR)/. -I${DESTDIR}/usr/include/readline -I$(.CURDIR)/../bfd
DPADD+= ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD+= -lreadline -ltermcap -lgnuregex
-.if exists(${.CURDIR}/../libiberty/obj)
-LDADD+= -L${.CURDIR}/../libiberty/obj -liberty
-DPADD+= ${.CURDIR}/../libiberty/obj/libiberty.a
+.if exists(${.OBJDIR}/../libiberty)
+LDADD+= -L${.OBJDIR}/../libiberty -liberty
+DPADD+= ${.OBJDIR}/../libiberty/libiberty.a
.else
LDADD+= -L${.CURDIR}/../libiberty/ -liberty
DPADD+= ${.CURDIR}/../libiberty/libiberty.a
.endif
-.if exists(${.CURDIR}/../bfd/obj)
-LDADD+= -L${.CURDIR}/../bfd/obj -lbfd
-DPADD+= ${.CURDIR}/../bfd/obj/libbfd.a
+.if exists(${.OBJDIR}/../bfd)
+LDADD+= -L${.OBJDIR}/../bfd -lbfd
+DPADD+= ${.OBJDIR}/../bfd/libbfd.a
.else
LDADD+= -L${.CURDIR}/../bfd/ -lbfd
DPADD+= ${.CURDIR}/../bfd/libbfd.a
.endif
-.if exists(${.CURDIR}/../mmalloc/obj)
-LDADD+= -L${.CURDIR}/../mmalloc/obj -lmmalloc
-DPADD+= ${.CURDIR}/../mmalloc/obj/libmmalloc.a
+.if exists(${.OBJDIR}/../mmalloc)
+LDADD+= -L${.OBJDIR}/../mmalloc -lmmalloc
+DPADD+= ${.OBJDIR}/../mmalloc/libmmalloc.a
.else
LDADD+= -L${.CURDIR}/../mmalloc/ -lmmalloc
DPADD+= ${.CURDIR}/../mmalloc/libmmalloc.a
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 16d12bf..bb32603 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.inc,v 1.12 1995/03/10 19:39:32 davidg Exp $
+# $Id: Makefile.inc,v 1.13 1995/03/11 03:48:42 nate Exp $
#
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../include
@@ -15,8 +15,8 @@ CFLAGS+= -DHAVE_PUTENV
CFLAGS+= -DGCC_NAME=\"cc\"
CFLAGS+= -DLINK_LIBGCC_SPECIAL_1
-.if exists(${.CURDIR}/../cc_int/obj)
-LIBDESTDIR= ${.CURDIR}/../cc_int/obj
+.if exists(${.OBJDIR}/../cc_int)
+LIBDESTDIR= ${.OBJDIR}/../cc_int
.else
LIBDESTDIR= ${.CURDIR}/../cc_int
.endif
diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index 9c26b86..c153243 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -1,5 +1,5 @@
-.if exists(${.CURDIR}/../lib/obj)
-LIBDESTDIR= ${.CURDIR}/../lib/obj
+.if exists(${.OBJDIR}/../lib)
+LIBDESTDIR= ${.OBJDIR}/../lib
.else
LIBDESTDIR= ${.CURDIR}/../lib
.endif
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 942a967..716789e 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id: Makefile,v 1.12 1996/05/07 23:15:24 wosch Exp $
PROG = gdb
BINDIR= /usr/bin
@@ -50,25 +50,25 @@ CFLAGS+= -I$(.CURDIR)/. -I${DESTDIR}/usr/include/readline -I$(.CURDIR)/../bfd
DPADD+= ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD+= -lreadline -ltermcap -lgnuregex
-.if exists(${.CURDIR}/../libiberty/obj)
-LDADD+= -L${.CURDIR}/../libiberty/obj -liberty
-DPADD+= ${.CURDIR}/../libiberty/obj/libiberty.a
+.if exists(${.OBJDIR}/../libiberty)
+LDADD+= -L${.OBJDIR}/../libiberty -liberty
+DPADD+= ${.OBJDIR}/../libiberty/libiberty.a
.else
LDADD+= -L${.CURDIR}/../libiberty/ -liberty
DPADD+= ${.CURDIR}/../libiberty/libiberty.a
.endif
-.if exists(${.CURDIR}/../bfd/obj)
-LDADD+= -L${.CURDIR}/../bfd/obj -lbfd
-DPADD+= ${.CURDIR}/../bfd/obj/libbfd.a
+.if exists(${.OBJDIR}/../bfd)
+LDADD+= -L${.OBJDIR}/../bfd -lbfd
+DPADD+= ${.OBJDIR}/../bfd/libbfd.a
.else
LDADD+= -L${.CURDIR}/../bfd/ -lbfd
DPADD+= ${.CURDIR}/../bfd/libbfd.a
.endif
-.if exists(${.CURDIR}/../mmalloc/obj)
-LDADD+= -L${.CURDIR}/../mmalloc/obj -lmmalloc
-DPADD+= ${.CURDIR}/../mmalloc/obj/libmmalloc.a
+.if exists(${.OBJDIR}/../mmalloc)
+LDADD+= -L${.OBJDIR}/../mmalloc -lmmalloc
+DPADD+= ${.OBJDIR}/../mmalloc/libmmalloc.a
.else
LDADD+= -L${.CURDIR}/../mmalloc/ -lmmalloc
DPADD+= ${.CURDIR}/../mmalloc/libmmalloc.a
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index 3a10f78..3e8fc4f 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,4 +1,4 @@
-# $Id: Makefile.cfg,v 1.8 1996/05/07 23:15:36 wosch Exp $
+# $Id: Makefile.cfg,v 1.9 1996/05/22 00:26:57 wosch Exp $
BINDIR?= /usr/bin
SHELL= /bin/sh
@@ -58,10 +58,10 @@ indexname=Ind
# Libraries
# Bad assumption, if one exists they all exist
-.if exists(${.CURDIR}/../libgroff/obj)
-LIBGROFF= $(.CURDIR)/../libgroff/obj/libgroff.a
-LIBDRIVER= $(.CURDIR)/../libdriver/obj/libdriver.a
-LIBBIB= $(.CURDIR)/../libbib/obj/libbib.a
+.if exists(${.OBJDIR}/../libgroff)
+LIBGROFF= $(.OBJDIR)/../libgroff/libgroff.a
+LIBDRIVER= $(.OBJDIR)/../libdriver/libdriver.a
+LIBBIB= $(.OBJDIR)/../libbib/libbib.a
.else
LIBGROFF= $(.CURDIR)/../libgroff/libgroff.a
LIBDRIVER= $(.CURDIR)/../libdriver/libdriver.a
@@ -127,6 +127,4 @@ CFLAGS+=$(DEFINES)
-e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
$< >$@
-.if exists(${.CURDIR}/obj)
-MANSRC=${.CURDIR}/obj
-.endif
+MANSRC=${.OBJDIR}
diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile
index cb5fd63..aa45037 100644
--- a/gnu/usr.bin/man/lib/Makefile
+++ b/gnu/usr.bin/man/lib/Makefile
@@ -1,7 +1,7 @@
LIB = man
-.if exists(${.CURDIR}/obj)
-CONFH= ${.CURDIR}/obj/config.h
+.if exists(${.OBJDIR})
+CONFH= ${.OBJDIR}/config.h
.else
CONFH= ${.CURDIR}/config.h
.endif
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 1807455..2fc044a 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -1,15 +1,15 @@
PROG= man
SRCS= man.c manpath.c glob.c
-.if exists(${.CURDIR}/../lib/obj)
-LDADD= -L${.CURDIR}/../lib/obj -lman
-CFLAGS+= -I${.CURDIR}/../lib/obj
+.if exists(${.OBJDIR}/../lib)
+LDADD= -L${.OBJDIR}/../lib -lman
+CFLAGS+= -I${.OBJDIR}/../lib
.else
LDADD= -L${.CURDIR}/../lib/ -lman
.endif
-.if exists(${.CURDIR}/obj)
-MAN1= ${.CURDIR}/obj/man.1
+.if exists(${.OBJDIR})
+MAN1= ${.OBJDIR}/man.1
.else
MAN1= ${.CURDIR}/man.1
.endif
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index 6633d6c..8e55b99 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -1,21 +1,21 @@
PROG= manpath
SRCS= manpath.c
-.if exists(${.CURDIR}/../lib/obj)
-LDADD= -L${.CURDIR}/../lib/obj -lman
+.if exists(${.OBJDIR}/../lib)
+LDADD= -L${.OBJDIR}/../lib -lman
.else
LDADD= -L${.CURDIR}/../lib/ -lman
.endif
-.if exists(${.CURDIR}/obj)
-MAN1=${.CURDIR}/obj/manpath.1
+.if exists(${.OBJDIR})
+MAN1=${.OBJDIR}/manpath.1
.else
MAN1=${.CURDIR}/manpath.1
.endif
DPADD+= ${MAN1}
CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS
-CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.CURDIR}/../lib/obj
+CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib
CLEANFILES+= ${MAN1}
MANDEPEND+= ${MAN1}
diff --git a/gnu/usr.bin/perl/usub/Makefile b/gnu/usr.bin/perl/usub/Makefile
index 826a976..b66d699 100644
--- a/gnu/usr.bin/perl/usub/Makefile
+++ b/gnu/usr.bin/perl/usub/Makefile
@@ -16,8 +16,8 @@ VPATH+= ${.CURDIR}/../perl
NOMAN= yes
# If perl exists in none of these places, something is horribly wrong.
-.if exists(${.CURDIR}/../perl/obj/perl)
-PERL=${.CURDIR}/../perl/obj/perl
+.if exists(${.OBJDIR}/../perl/perl)
+PERL=${.OBJDIR}/../perl/perl
.endif
.if !defined(PERL) && exists(${.CURDIR}/../perl/perl)
PERL=${.CURDIR}/../perl/perl
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
index cd593ed..22d60d7 100644
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ b/gnu/usr.bin/rcs/Makefile.inc
@@ -1,7 +1,7 @@
# Location of librcs
-.if exists(${.CURDIR}/../lib/obj)
-LIBRCS= ${.CURDIR}/../lib/obj/librcs.a
+.if exists(${.OBJDIR}/../lib)
+LIBRCS= ${.OBJDIR}/../lib/librcs.a
.else
LIBRCS= ${.CURDIR}/../lib/librcs.a
.endif
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index a6e4d22..52fa57d 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -13,7 +13,7 @@ SUBDIR+= doc
LINKS= ${BINDIR}/send-pr ${BINDIR}/sendbug
MLINKS= send-pr.1 sendbug.1
-all: send-pr _PROGSUBDIR
+all: send-pr _SUBDIR
send-pr: send-pr.sh Makefile
sed -e 's,@DATADIR@,/etc,g' \
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index fed0a54..65c89da 100644
--- a/gnu/usr.bin/texinfo/doc/Makefile
+++ b/gnu/usr.bin/texinfo/doc/Makefile
@@ -1,6 +1,6 @@
INFO= info info-stnd makeinfo texi
-.if exists(../makeinfo/obj)
-MAKEINFO= ${.CURDIR}/../makeinfo/obj/makeinfo
+.if exists(${.OBJDIR}/../makeinfo)
+MAKEINFO= ${.OBJDIR}/../makeinfo/makeinfo
.else
MAKEINFO= ${.CURDIR}/../makeinfo/makeinfo
.endif
OpenPOWER on IntegriCloud