Fixed a bug I introduced in the last update. devices/*/Makefile were

barfing on the definition of libraries due to the added directory level.
Easy fix, as they don't need that code.
This commit is contained in:
davidb 1993-12-30 00:10:17 +00:00
parent 5b6c771aeb
commit c98d8a269a
2 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile.cfg,v 1.11 1993/12/28 11:21:13 davidb Exp $
# $Id: Makefile.cfg,v 1.12 1993/12/30 00:10:17 davidb Exp $
.if defined(PROG)
LDADD+= -lgnumalloc
@ -6,6 +6,9 @@ DPADD+= /usr/lib/libgnumalloc.a
.endif
# Paths to libraries
#
# DEVICES_ is defined in devices/Makefile.inc to avoid this section.
.if !defined(DEVICES_)
LIBGROFF!=cd $(.CURDIR)/../libgroff; \
printf "xxx:\n\techo \$${.OBJDIR}/libgroff.a\n" | make -r -s -f - xxx
@ -14,6 +17,7 @@ LIBDRIVER!=cd $(.CURDIR)/../libdriver; \
LIBBIB!=cd $(.CURDIR)/../libbib; \
printf "xxx:\n\techo \$${.OBJDIR}/libbib.a\n" | make -r -s -f - xxx
.endif
CFLAGS+= -DHAVE_UNISTD_H=1\
-DHAVE_DIRENT_H=1\

View File

@ -1,9 +1,10 @@
# from: @(#)Makefile.dev 6.2 (Berkeley) 3/16/91
# $Id: Makefile.dev,v 1.11 1993/08/15 19:14:59 mycroft Exp $
# $Id: Makefile.dev,v 1.12 1993/12/30 00:11:06 davidb Exp $
# Client Makefiles define DEVICE and FONTFILES and provide rules for
# individual font files
DEVICES_=no_libraries
.include "../../Makefile.cfg"
# XXX -- this depends on ../include/defs.h