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

Fixed objdir handling to cope with OBJMACHINE.

This commit is contained in:
davidb 1993-12-21 22:13:06 +00:00
parent 22a4a0d445
commit b766647b77
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/libexec/uucp/Makefile.inc
View File

@ -1,16 +1,22 @@
.if exists(${.CURDIR}/../libunix/obj)
.if exists(${.CURDIR}/../libunix/obj.${MACHINE})
LIBUNIX= $(.CURDIR)/../libunix/obj.${MACHINE}/libunix.a
.elif exists(${.CURDIR}/../libunix/obj)
LIBUNIX= $(.CURDIR)/../libunix/obj/libunix.a
.else
LIBUNIX= $(.CURDIR)/../libunix/libunix.a
.endif
.if exists(${.CURDIR}/../libuuconf/obj)
.if exists(${.CURDIR}/../libuuconf/obj.${MACHINE})
LIBUUCONF= $(.CURDIR)/../libuuconf/obj.${MACHINE}/libuuconf.a
.elif exists(${.CURDIR}/../libuuconf/obj)
LIBUUCONF= $(.CURDIR)/../libuuconf/obj/libuuconf.a
.else
LIBUUCONF= $(.CURDIR)/../libuuconf/libuuconf.a
.endif
.if exists(${.CURDIR}/../libuucp/obj)
.if exists(${.CURDIR}/../libuucp/obj.${MACHINE})
LIBUUCP= $(.CURDIR)/../libuucp/obj.${MACHINE}/libuucp.a
.elif exists(${.CURDIR}/../libuucp/obj)
LIBUUCP= $(.CURDIR)/../libuucp/obj/libuucp.a
.else
LIBUUCP= $(.CURDIR)/../libuucp/libuucp.a

14
gnu/usr.bin/groff/Makefile.cfg
View File

@ -1,4 +1,4 @@
# $Id: Makefile.cfg,v 1.9 1993/11/03 16:29:57 cgd Exp $
# $Id: Makefile.cfg,v 1.10 1993/12/21 22:14:02 davidb Exp $
.if defined(PROG)
LDADD+= -lgnumalloc
@ -6,19 +6,25 @@ DPADD+= /usr/lib/libgnumalloc.a
.endif
# Paths to libraries
.if exists($(.CURDIR)/../libgroff/obj)
.if exists($(.CURDIR)/../libgroff/obj.${MACHINE})
LIBGROFF= $(.CURDIR)/../libgroff/obj.${MACHINE}/libgroff.a
.elif exists($(.CURDIR)/../libgroff/obj)
LIBGROFF= $(.CURDIR)/../libgroff/obj/libgroff.a
.else
LIBGROFF= $(.CURDIR)/../libgroff/libgroff.a
.endif
.if exists($(.CURDIR)/../libdriver/obj)
.if exists($(.CURDIR)/../libdriver/obj.${MACHINE})
LIBDRIVER= $(.CURDIR)/../libdriver/obj.${MACHINE}/libdriver.a
.elif exists($(.CURDIR)/../libdriver/obj)
LIBDRIVER= $(.CURDIR)/../libdriver/obj/libdriver.a
.else
LIBDRIVER= $(.CURDIR)/../libdriver/libdriver.a
.endif
.if exists($(.CURDIR)/../libbib/obj)
.if exists($(.CURDIR)/../libbib/obj.${MACHINE})
LIBBIB= $(.CURDIR)/../libbib/obj.${MACHINE}/libbib.a
.elif exists($(.CURDIR)/../libbib/obj)
LIBBIB= $(.CURDIR)/../libbib/obj/libbib.a
.else
LIBBIB= $(.CURDIR)/../libbib/libbib.a