pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/db4/patches Fix install when BSD_INSTALL_PRO...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0aafbc5488c6
branches:  trunk
changeset: 464349:0aafbc5488c6
user:      epg <epg%pkgsrc.org@localhost>
date:      Sun Dec 07 02:30:31 2003 +0000

description:
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.

diffstat:

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

diffs (31 lines):

diff -r 25404e8ecc52 -r 0aafbc5488c6 databases/db4/patches/patch-aa
--- a/databases/db4/patches/patch-aa    Sun Dec 07 01:56:16 2003 +0000
+++ b/databases/db4/patches/patch-aa    Sun Dec 07 02:30:31 2003 +0000
@@ -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 @@
  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 @@
 -              $(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:



Home | Main Index | Thread Index | Old Index