From cbf98eadbcb5cd378a0cc26ffd00bcd783d2649c Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Fri, 16 Jul 2010 07:10:54 +0000
Subject: [PATCH] Cleanups and fixups for F-13 Perl.

---
 .bashrc      | 10 ++--------
 bin/perlilib | 28 ----------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100755 bin/perlilib

diff --git a/.bashrc b/.bashrc
index 6fc61af..7699036 100644
--- a/.bashrc
+++ b/.bashrc
@@ -97,13 +97,7 @@ _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
 _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 
-# /share/perl for Debian
-# /lib/perl for Debian
-# /lib/perl5 for Fedora Core
-mkdir -p $HOME/lib{64,}/perl5	# otherwise CPAN will install to "$HOME/lib{64,}/site_perl" etc.
-_perlpatt="$(perl -MConfig -e 'print "{,/".$Config{$_}."}" for qw(version archname);')"
-for _perldir in $(eval "echo {/usr,$HOME}{/lib{64,}/perl{,5},/share/perl}{,/site_perl}$_perlpatt");do
-	# $PERL5LIB overrides $PERLLIB and it is being used by: /etc/profile.d/atrpms.*
+for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5");do
 	_bash_profile_addpath -f PERL5LIB "$_perldir"
 	done
 unset _perldir
@@ -167,7 +161,7 @@ export IGNOREEOF=10
 [ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
 export EDITOR='vim'
 [ -x /bin/less ] && export PAGER='/bin/less -MMh5cis'
-export PERL_MM_OPT="PERL=$HOME/bin/perlilib"
+export PERL_MM_OPT=""
 [ "$UID" -ne 0 ] && export PERL_MM_OPT="$PERL_MM_OPT PREFIX=$HOME"
 for file in $HOME/.bookmarks.html;do
 	export WWW_HOME="file://$HOME/"
diff --git a/bin/perlilib b/bin/perlilib
deleted file mode 100755
index 0ee7b47..0000000
--- a/bin/perlilib
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-#
-#	$Id$
-
-exec /usr/bin/perl`echo "${PERLLIB:+:$PERLLIB}"|sed 's/:/ -I/g'` "$@"
-
-exit 0
-
-exec /usr/bin/perl -e '
-	@LIB=qw(
-		/home/short/lib/perl5/site_perl/5.6.1/i386-linux
-		/home/short/lib/perl5/site_perl/5.6.1
-		/home/short/lib/perl5/site_perl/i386-linux
-		/home/short/lib/perl5/site_perl
-		/home/short/lib/perl5/5.6.1/i386-linux
-		/home/short/lib/perl5/5.6.1
-		/home/short/lib/perl5/i386-linux
-		/home/short/lib/perl5
-		/usr/lib/perl5/5.6.1/i386-linux
-		/usr/lib/perl5/5.6.1
-		/usr/lib/perl5/site_perl/5.6.1/i386-linux
-		/usr/lib/perl5/site_perl/5.6.1
-		/usr/lib/perl5/site_perl
-		/usr/lib/perl5/vendor_perl/5.6.1/i386-linux
-		/usr/lib/perl5/vendor_perl/5.6.1
-		/usr/lib/perl5/vendor_perl
-		.);' \
-		"$@"
-- 
1.8.3.1