From 66aba019f39f395070d3069bc3e7b17b03ef07cc Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 17 Aug 1996 04:45:38 +0000
Subject: hack around a few bugs till michael wakes up

---
 usr.bin/locate/bigram/Makefile |  4 ++--
 usr.bin/locate/code/Makefile   |  4 ++--
 usr.bin/locate/locate/Makefile | 22 +++++++++-------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index 1d5c2980986..afa8faffd80 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1996/08/16 22:00:10 michaels Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/08/17 04:45:38 deraadt Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	locate.bigram
 NOMAN=	noman
-BINDIR=	${LIBEXECDIR}
+BINDIR=	/usr/libexec
 CFLAGS+= -I${.CURDIR}/../locate
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 97b193456b7..20d0a33884d 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1996/08/16 22:00:11 michaels Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/08/17 04:45:39 deraadt Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	locate.code
 CFLAGS+= -I${.CURDIR}/../locate 
 NOMAN=	noman
-BINDIR=	${LIBEXECDIR}
+BINDIR=	/usr/libexec
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 1c810bf413f..f7b55ded607 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,22 +1,18 @@
-#	$OpenBSD: Makefile,v 1.3 1996/08/16 22:00:12 michaels Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/08/17 04:45:40 deraadt Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.3 1996/08/16 22:00:12 michaels Exp $
+# $Id: Makefile,v 1.4 1996/08/17 04:45:40 deraadt Exp $
 
 PROG=	locate
-MAN= locate.1 locate.updatedb.8
+MAN= locate.1 #locate.updatedb.8
 SCRIPTS= updatedb mklocatedb concatdb
-MLINKS+= locate.updatedb.8 updatedb.8
+#MLINKS+= locate.updatedb.8 updatedb.8
+LIBEXECDIR=/usr/libexec
 
 beforeinstall:
-.for script in ${SCRIPTS}
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-    	${.CURDIR}/${script}.sh ${DESTDIR}${LIBEXECDIR}/locate.${script}
-.endfor
+	-@for i in $(SCRIPTS); do \
+		install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		    ${.CURDIR}/$$i.csh ${DESTDIR}${LIBEXECDIR}/locate.$$i; \
+	done
 
-# only /usr/src/etc/Makefile install files in /etc
-#	${INSTALL} -c -o root -g wheel -m 644 \
-#		${.CURDIR}/locate.rc ${DESTDIR}/etc
-
-.include "../../Makefile.inc"
 .include <bsd.prog.mk>
-- 
cgit v1.2.3-59-g8ed1b