Merge branch '4.5.4'

This commit is contained in:
Tom Eastep 2012-06-09 06:27:53 -07:00
commit 73325c579e
2 changed files with 1 additions and 5 deletions

View File

@ -81,9 +81,6 @@ for p in $@; do
DATADIR) DATADIR)
pn=SHAREDIR pn=SHAREDIR
;; ;;
SYSCONFDIR)
pn=CONFDIR
;;
esac esac
params[${pn}]="${pv}" params[${pn}]="${pv}"

View File

@ -39,8 +39,7 @@ my %options;
my %aliases = ( VENDOR => 'HOST', my %aliases = ( VENDOR => 'HOST',
SHAREDSTATEDIR => 'VARDIR', SHAREDSTATEDIR => 'VARDIR',
DATADIR => 'SHAREDIR', DATADIR => 'SHAREDIR' );
SYSCONFDIR => 'CONFDIR' );
for ( @ARGV ) { for ( @ARGV ) {
die "ERROR: Invalid option specification ( $_ )" unless /^(?:--)?(\w+)=(.*)$/; die "ERROR: Invalid option specification ( $_ )" unless /^(?:--)?(\w+)=(.*)$/;