summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2002-07-08 19:10:05 -0700
committerTim Rice <tim@multitalents.net>2002-07-08 19:10:05 -0700
commit2d0bf3dcfdab65d1627b9612b5558a38a0eb000d (patch)
tree3164711dbad8c406f14da1906c99012ea74102d4
parent88177245cb5c1b16a2fa6ef5f151cc8b963112ef (diff)
[Makefile.in] workaround for broken pakadd on some systems.
With "ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin" you wild end up with lrwxrwxrwx 1 root sys 4 Jul 8 18:43 slogin -> /ssh after the package was installed.
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a48d7efb..abc99c38a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120020708 120020708
2 - (tim) [openssh/contrib/solaris/buildpkg.sh] add PKG_INSTALL_ROOT to 2 - (tim) [openssh/contrib/solaris/buildpkg.sh] add PKG_INSTALL_ROOT to
3 work in a jumpstart environment. patch by kbrint@rufus.net 3 work in a jumpstart environment. patch by kbrint@rufus.net
4 - (tim) [Makefile.in] workaround for broken pakadd on some systems.
4 5
520020707 620020707
6 - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH) 7 - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH)
@@ -1313,4 +1314,4 @@
1313 - (stevesk) entropy.c: typo in debug message 1314 - (stevesk) entropy.c: typo in debug message
1314 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1315 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1315 1316
1316$Id: ChangeLog,v 1.2349 2002/07/09 02:02:10 tim Exp $ 1317$Id: ChangeLog,v 1.2350 2002/07/09 02:10:05 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 8b341dc00..1d71cf34b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.219 2002/07/07 20:30:46 tim Exp $ 1# $Id: Makefile.in,v 1.220 2002/07/09 02:10:06 tim Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -247,9 +247,9 @@ install-files: scard-install
247 @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 247 @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
248 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 248 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
249 -rm -f $(DESTDIR)$(bindir)/slogin 249 -rm -f $(DESTDIR)$(bindir)/slogin
250 ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin 250 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
251 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 251 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
252 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 252 ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
253 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ 253 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
254 $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ 254 $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
255 fi 255 fi