Source-Changes-HG archive

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

[src/trunk]: src/x11/bin/ssh-askpass Use



details:   https://anonhg.NetBSD.org/src/rev/d88f0d3dda12
branches:  trunk
changeset: 558128:d88f0d3dda12
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jan 29 01:00:42 2004 +0000

description:
Use
        FILES+=                 SshAskpass.ad
        FILESNAME_SshAskpass.ad=SshAskpass-default.ad
instead of
        FILES+=                 SshAskpass-default.ad
because of an obscure bug with "make -j" where it doesn't find
SshAskpass-default.ad in the .PATH correctly, probably because
of the rule created for it from BUILDSYMLINKS by <bsd.files.mk>.

This is not the correct long-term solution, and is a temporary
workaround for PR 24020.

diffstat:

 x11/bin/ssh-askpass/Makefile |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 302f7efa9f98 -r d88f0d3dda12 x11/bin/ssh-askpass/Makefile
--- a/x11/bin/ssh-askpass/Makefile      Thu Jan 29 00:21:31 2004 +0000
+++ b/x11/bin/ssh-askpass/Makefile      Thu Jan 29 01:00:42 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/11/08 13:57:29 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2004/01/29 01:00:42 lukem Exp $
 
 NOMAN=         yes
 
@@ -13,7 +13,18 @@
 
 FILESDIR=      ${X11ROOTDIR}/share/examples/ssh-askpass
 FILES=         SshAskpass-1337.ad SshAskpass-NeXTish.ad \
-               SshAskpass-default.ad SshAskpass-green.ad SshAskpass-motif.ad
+               SshAskpass.ad SshAskpass-green.ad SshAskpass-motif.ad
+
+# XXX: We use the following two lines instead of just having
+# XXX:         FILES+= SshAskpass-default.ad
+# XXX: because of an obscure bug with "make -j" where it doesn't find
+# XXX: SshAskpass-default.ad in the .PATH correctly, probably because
+# XXX: of the rule created for it from BUILDSYMLINKS by <bsd.files.mk>.
+# XXX: This is not the correct long-term solution.
+#
+FILES+=                        SshAskpass.ad
+FILESNAME_SshAskpass.ad=SshAskpass-default.ad
+
 
 CPPFLAGS+=     -I.
 DPSRCS+=       SshAskpass_ad.h



Home | Main Index | Thread Index | Old Index