View | Details | Raw Unified | Return to bug 37911
Collapse All | Expand All

(-)a/Makefile.PL (-7 / +11 lines)
Lines 676-686 $file_map->{'koha-tmpl/intranet-tmpl/prog/css/holds.css'} = 'blib/INTRANE Link Here
676
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/installer.css'}    = 'blib/INTRANET_TMPL_DIR/prog/css/installer.css';
676
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/installer.css'}    = 'blib/INTRANET_TMPL_DIR/prog/css/installer.css';
677
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/mainpage.css'}     = 'blib/INTRANET_TMPL_DIR/prog/css/mainpage.css';
677
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/mainpage.css'}     = 'blib/INTRANET_TMPL_DIR/prog/css/mainpage.css';
678
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/staff-global.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/staff-global.css';
678
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/staff-global.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/staff-global.css';
679
$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/erm.js'}   = 'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/erm.js';
679
680
$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/preservation.js'} =
680
#NOTE: The 'koha-tmpl/intranet-tmpl/prog/js/vue/dist' directory is now handled in the "top_targets" function
681
    'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/preservation.js';
682
$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/admin/record_sources.js'} =
683
    'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/admin/record_sources.js';
684
681
685
#OPAC_TMPL_DIR
682
#OPAC_TMPL_DIR
686
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/opac.css'}      = 'blib/OPAC_TMPL_DIR/bootstrap/css/opac.css';
683
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/opac.css'}      = 'blib/OPAC_TMPL_DIR/bootstrap/css/opac.css';
Lines 1910-1920 sub postamble { Link Here
1910
sub top_targets {
1907
sub top_targets {
1911
    my $inherited = shift->SUPER::top_targets(@_);
1908
    my $inherited = shift->SUPER::top_targets(@_);
1912
    my $compile_step;
1909
    my $compile_step;
1910
1911
    #NOTE: Make "all" depend on "compile_css_js"
1913
    $compile_step .= "all :: compile_css_js\n";
1912
    $compile_step .= "all :: compile_css_js\n";
1914
    $compile_step .= "\t" . '$(NOECHO) $(NOOP)' . "\n";
1913
    $compile_step .= "\t" . '$(NOECHO) $(NOOP)' . "\n";
1915
    $compile_step .= "\n";
1914
    $compile_step .= "\n";
1916
    $compile_step .= "compile_css_js:\n";
1915
1916
    #NOTE: Make compile_css_js depend on pm_to_blib, so we have access to the blib directory
1917
    $compile_step .= "compile_css_js: pm_to_blib\n";
1917
    $compile_step .= "\t" . '$(PERLRUN) build-resources.PL' . "\n";
1918
    $compile_step .= "\t" . '$(PERLRUN) build-resources.PL' . "\n";
1919
1920
    #NOTE: Copy the generated vue dist files into the relevant blib
1921
    $compile_step .= "\t" . 'cp -r koha-tmpl/intranet-tmpl/prog/js/vue/dist blib/INTRANET_TMPL_DIR/prog/js/vue/' . "\n";
1922
1918
    my $top_targets = $compile_step . "\n" . $inherited;
1923
    my $top_targets = $compile_step . "\n" . $inherited;
1919
    return $top_targets;
1924
    return $top_targets;
1920
}
1925
}
1921
- 

Return to bug 37911