From 1c8aca4c02647ae179fd8a4f7b945ec0e7e93dd3 Mon Sep 17 00:00:00 2001 From: jtc Date: Fri, 16 Jul 1993 17:11:36 +0000 Subject: Final makefile tweaks to make sure everything is installed correctly for 0.9. --- gnu/usr.bin/groff/devices/Makefile.dev | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/usr.bin/groff/devices/Makefile.dev b/gnu/usr.bin/groff/devices/Makefile.dev index ea84a440de7..9c1b62f510f 100644 --- a/gnu/usr.bin/groff/devices/Makefile.dev +++ b/gnu/usr.bin/groff/devices/Makefile.dev @@ -5,7 +5,10 @@ .include "../../Makefile.cfg" -DEVICEDIR?= $(fontdir)/dev$(DEVICE) +# XXX -- this depends on ../include/defs.h +FONTDIR= /usr/share/groff_font + +DEVICEDIR?= $(DESTDIR)$(FONTDIR)/dev$(DEVICE) FONTOWN?= bin FONTGRP?= bin FONTMODE?= 444 @@ -43,18 +46,13 @@ cleandir: .if !target(install) install: - -if test ! -d $(DESTDIR)$(DEVICEDIR); then \ - install -d -o $(BINOWN) -g $(BINGRP) -m 755 \ - $(DESTDIR)$(DEVICEDIR); \ - fi + install -d -o $(BINOWN) -g $(BINGRP) -m 755 $(DEVICEDIR) -if test -d $(.CURDIR)/generate; then \ - if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \ - install -d -o $(BINOWN) -g $(BINGRP) -m 755 \ - $(DESTDIR)$(DEVICEDIR)/generate; \ - fi; \ + install -d -o $(BINOWN) -g $(BINGRP) -m 755 \ + $(DEVICEDIR)/generate; \ fi -for f in $(FONTFILES); do \ install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \ - $(DESTDIR)$(DEVICEDIR)/$$f; \ + $(DEVICEDIR)/$$f; \ done .endif -- cgit