Author: dom Date: 2013-01-02 00:12:16 +0000 (Wed, 02 Jan 2013) New Revision: 1449

Modified: trunk/Changes trunk/lib/OpenGuides/Build.pm Log: Respect destdir when installing scripts, templates, etc

Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-12-18 22:27:01 UTC (rev 1448) +++ trunk/Changes 2013-01-02 00:12:16 UTC (rev 1449) @@ -9,7 +9,8 @@ Test::HTML::Content (et al) mode used when XML::LibXML is not installed Work around a "No such method textContent" bug in - Test::HTML::Content when XML::LibXML is not installed + Test::HTML::Content when XML::LibXML is not installed + Respect destdir when installing scripts, templates, etc

0.70 26 August 2012 New elements allowed in page content: span, dl, dt, dd (fixes #303).

Modified: trunk/lib/OpenGuides/Build.pm =================================================================== --- trunk/lib/OpenGuides/Build.pm 2012-12-18 22:27:01 UTC (rev 1448) +++ trunk/lib/OpenGuides/Build.pm 2013-01-02 00:12:16 UTC (rev 1449) @@ -58,12 +58,12 @@ my $config = OpenGuides::Config->new( file => "wiki.conf" );

# Install the scripts where we were told to. - my $install_directory = $config->install_directory; + my $install_directory = File::Spec->catdir($self->destdir, $config->install_directory); my $script_name = $config->script_name; - my $template_path = $config->template_path; - my $custom_template_path = $config->custom_template_path; + my $template_path = File::Spec->catdir($self->destdir, $config->template_path); + my $custom_template_path = File::Spec->catdir($self->destdir, $config->custom_template_path); my $custom_lib_path = $config->custom_lib_path; - my $static_path = $config->static_path; + my $static_path = File::Spec->catdir($self->destdir, $config->static_path); my @extra_scripts = @{ $self->config_data( "__extra_scripts" ) }; my @templates = @{ $self->config_data( "__templates" ) }; my @static_files = @{ $self->config_data( "__static_files" ) };