From f0a7ea4d3c403b364b809b19618a2236b439f0bb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 24 Oct 2008 04:54:40 +0200 Subject: [PATCH] perl: works in the chroot now. --HG-- extra : convert_revision : d2ec570e3c42559f78715fb180300e7beb17b007 --- templates/perl-runstuff-before-build.sh | 13 +++++++++---- templates/perl.tmpl | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/templates/perl-runstuff-before-build.sh b/templates/perl-runstuff-before-build.sh index 07befebfcb..d590593fb5 100644 --- a/templates/perl-runstuff-before-build.sh +++ b/templates/perl-runstuff-before-build.sh @@ -1,7 +1,12 @@ # This fixes the definitions that the perl binary uses to look at # prefix and not XBPS_DESTDIR/MASTERDIR. -$sed_cmd -i \ - -e "s|$XBPS_DESTDIR\/$pkgname-$version|/usr|g" \ - -e "s|$XBPS_MASTERDIR||g" \ - $wrksrc/config.h +if [ "$XBPS_DESTDIR" != "/xbps" ]; then + sed -i -e "s|$XBPS_DESTDIR\/$pkgname-$version|/usr|g" $wrksrc/config.h +fi + +sed -i -e "s|/usr/usr|/usr|g" $wrksrc/config.h + +if [ "$XBPS_MASTERDIR" != "/" ]; then + sed -i -e "s|$XBPS_MASTERDIR||g" $wrksrc/config.h +fi diff --git a/templates/perl.tmpl b/templates/perl.tmpl index 1c8e23fb1d..6c5f9b9a9b 100644 --- a/templates/perl.tmpl +++ b/templates/perl.tmpl @@ -3,8 +3,8 @@ pkgname=perl version=5.10.0 distfiles="http://www.cpan.org/src/$pkgname-$version@.tar.gz" configure_script="./Configure" -configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version - -Duselargefiles -Uusesfio -Dinstallstyle=lib/perl5" +configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version/usr + -Duselargefiles -Uusesfio -Dinstallstyle=lib/perl5 -Uinstallusrbinperl" build_style=configure short_desc="Practical Extraction and Report Language" maintainer="Juan RP "