From 87166d40c4301f00823ce5d687b2017b38ec239c Mon Sep 17 00:00:00 2001
From: epg <epg@pkgsrc.org>
Date: Sun, 7 Dec 2003 02:30:31 +0000
Subject: Fix install when BSD_INSTALL_PROGRAM uses the -s option.  Can't use
 BSD_INSTALL_PROGRAM because some of the programs in the list are interpreted
 scripts and others machine executables.

---
 databases/db4/patches/patch-aa | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'databases/db4')

diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa
index 567186b565b..a898e4361ad 100644
--- a/databases/db4/patches/patch-aa
+++ b/databases/db4/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/12/07 00:51:07 epg Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/07 02:30:31 epg Exp $
 
 --- ../dist/Makefile.in.orig	Fri Nov 28 13:50:06 2003
 +++ ../dist/Makefile.in
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.3 2003/12/07 00:51:07 epg Exp $
  libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
  libtso_static=	$(libtso_base)-$(LIBVERSION).a
  libtso_target=	$(libtso_base)-$(LIBVERSION).la
-@@ -833,11 +833,8 @@ install_utilities:
+@@ -833,11 +833,10 @@ install_utilities:
  	    ($(mkdir) -p $(DESTDIR)$(bindir) && \
  	    $(chmod) $(dmode) $(DESTDIR)$(bindir))
  	@for i in $(UTIL_PROGS); do \
@@ -69,8 +69,10 @@ $NetBSD: patch-aa,v 1.3 2003/12/07 00:51:07 epg Exp $
 -		$(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
 -		test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \
 -		$(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \
-+		${BSD_INSTALL_PROGRAM} $$i \
-+		    ${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`; \
++		target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \
++		$(INSTALLER) $$i $${target}; \
++		test -f $(strip) && $(strip) $${target} || true; \
++		$(chmod) $(emode) $${target}; \
  	done
  
  uninstall_utilities:
-- 
cgit v1.2.3