Re: bleadperl make install fails due to "psed"

Message-ID: <m3u22zg3y7.fsf@ak-71.mind.de>

p4raw-id: //depot/perl@10000

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index a0ba96a..25085fc 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -129,7 +129,7 @@ a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
        $(CCCMD) a2p.c
 
 clean:
-       rm -f a2p *$(OBJ_EXT) $(plexe) $(plc) $(plm)
+       rm -f a2p psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
        rm -f core $(addedbyconf) all malloc.c

diff --git a/x2p/s2p.PL b/x2p/s2p.PL
index d215781..a24a2e2 100644 (file)
--- a/x2p/s2p.PL
+++ b/x2p/s2p.PL
@@ -1960,5 +1960,14 @@ way you wish, provided you do not restrict others from doing the same.
 
 close OUT or die "Can't close $file: $!";
 chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
+unlink 'psed';
+print "Linking s2p to psed.\n";
+if (defined $Config{d_link}) {
+  link 's2p', 'psed';
+} else {
+  unshift @INC, '../lib';
+  require File::Copy;
+  File::Copy::syscopy('s2p', 'psed');
+}
 exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
 chdir $origdir;