This is the next version.
About the /usr/runtime location I'm not sure yet.
Is this really kosher?
On cygwin the .include searchpath is now:
/usr/runtime/parrot/include
/usr/runtime/parrot
/usr
/usr/lib/parrot/include
/usr/lib/parrot/
.
with extensions: "" .exe .lnk .exe.lnk .past .past.exe .past.lnk
.past.exe.lnk
.pir .pir.exe .pir.lnk .pir.exe.lnk
The exe .lnk magic is cygwin specific. The rest is common.
--
Reini Urban
2008-07-03 20:43:41 rurban
use sane defaults without destdir, prefix and without buildprefix.
esp. main and library files to /usr/lib/parrot and not just to prefix
(/usr) is important.
there's also a fix for a minor cygwin stat-copy discrepancy.
does does about the same as the fedora spec file, the debian rule,
the gentto ebuild and freebsd ports Makefile.
diff -u src/parrot-0.6.3/tools/dev/install_files.pl.orig
--- origsrc/parrot-0.6.3/tools/dev/install_files.pl 2008-05-18 16:44:14.000000000 +0000
+++ src/parrot-0.6.3/tools/dev/install_files.pl 2008-07-03 07:46:47.500000000 +0000
@@ -126,7 +126,7 @@
bindir => '/usr/bin',
libdir => '/usr/lib',
includedir => '/usr/include',
- docdir => '/usr/share/doc',
+ docdir => '/usr/share/doc/parrot',
'dry-run' => 0,
);
@@ -189,6 +189,7 @@
}
elsif ( $meta{include} ) {
$dest =~ s/^include//;
+ $dest =~ s/^src/parrot/;
$dest = File::Spec->catdir( $options{includedir}, $dest );
}
elsif ( $meta{doc} ) {
@@ -197,12 +198,14 @@
elsif ( $meta{pkgconfig} ) {
# For the time being this is hardcoded as being installed under libdir
- # as it is typically donw with automake installed packages. If there
+ # as it is typically done with automake installed packages. If there
# is a use case to make this configurable we'll add a seperate
# --pkgconfigdir option.
$dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
}
else {
+ $dest =~ s|^src/|lib/parrot/src/|;
+ next if $dest =~ /compilers|config|language|tools/;
$dest = File::Spec->catdir( $options{prefix}, $dest );
}
@@ -243,6 +247,7 @@
}
else {
next unless -e $src;
+ next if $^O eq 'cygwin' and -e "$src.exe"; # cygwin stat works, but copy not
copy( $src, $dest ) or die "copy $src to $dest: $!\n";
print "$dest\n";
}