From dc3c30d9be2ee65feddd69e89eaafcf8940350f2 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Thu, 2 Feb 1995 17:44:02 +0000
Subject: [PATCH] Look for files to install first in the object directory, then
 in the source directory.

Don't create target directories at install time.  mtree already handles
them correctly.
---
 gnu/usr.bin/groff/Makefile.dev      | 17 +++--------------
 gnu/usr.bin/groff/font/Makefile.dev | 17 +++--------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 0df1d80a396..4f6948fb19d 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -20,20 +20,9 @@ maninstall:
 
 .if !target(install)
 install:
-	-if test ! -d $(DESTDIR)$(DEVICEDIR); then \
-		mkdir $(DESTDIR)$(DEVICEDIR); \
-		chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR); \
-		chmod 755 $(DESTDIR)$(DEVICEDIR); \
-	fi
-	-if test -d $(.CURDIR)/generate; then \
-		if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \
-			mkdir $(DESTDIR)$(DEVICEDIR)/generate; \
-			chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR)/generate; \
-			chmod 755 $(DESTDIR)$(DEVICEDIR)/generate; \
-		fi; \
-	fi
-	-for f in $(FONTFILES); do \
-		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \
+	for f in $(FONTFILES); do \
+		ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \
+		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
 			$(DESTDIR)$(DEVICEDIR)/$$f; \
 	done
 .endif
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 0df1d80a396..4f6948fb19d 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -20,20 +20,9 @@ maninstall:
 
 .if !target(install)
 install:
-	-if test ! -d $(DESTDIR)$(DEVICEDIR); then \
-		mkdir $(DESTDIR)$(DEVICEDIR); \
-		chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR); \
-		chmod 755 $(DESTDIR)$(DEVICEDIR); \
-	fi
-	-if test -d $(.CURDIR)/generate; then \
-		if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \
-			mkdir $(DESTDIR)$(DEVICEDIR)/generate; \
-			chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR)/generate; \
-			chmod 755 $(DESTDIR)$(DEVICEDIR)/generate; \
-		fi; \
-	fi
-	-for f in $(FONTFILES); do \
-		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \
+	for f in $(FONTFILES); do \
+		ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \
+		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
 			$(DESTDIR)$(DEVICEDIR)/$$f; \
 	done
 .endif