Browse Source

Fix automake icons installation

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
tags/r14.0.0^0
Slávek Banko 5 years ago
parent
commit
04db460623
1 changed files with 11 additions and 9 deletions
  1. 11
    9
      am_edit

+ 11
- 9
am_edit View File

@@ -1528,11 +1528,12 @@ sub tag_ICON()
my $type = $prefix;
$type =~ s/^.*-([^-]+)$/$1/;
$prefix =~ s/^(.*)-[^-]+$/$1/;
my %type_hash =
(
'action' => 'actions',
'app' => 'apps',
'category' => 'categories',
'device' => 'devices',
'filesys' => 'places',
'mime' => 'mimetypes'
@@ -1580,15 +1581,16 @@ sub tag_ICON()
print STDERR "unknown icon prefix $prefix in $printname\n";
next;
}
my $dir = $dir_hash{$prefix} . "/" . $type_hash{$type};
if ($newfile =~ /-[^\.]/) {
my $tmp = $newfile;
$tmp =~ s/^([^-]+)-.*$/$1/;
$dir = $dir . "/" . $tmp;
$newfile =~ s/^[^-]+-//;
}
#-- does not convert from dashes to folders inside icon names
#if ($newfile =~ /-[^\.]/) {
# my $tmp = $newfile;
# $tmp =~ s/^([^-]+)-.*$/$1/;
# $dir = $dir . "/" . $tmp;
# $newfile =~ s/^[^-]+-//;
#}

if (!defined $directories{$dir}) {
$install .= "\t\$(mkinstalldirs) \$(DESTDIR)\$($destdir)/$dir\n";
$directories{$dir} = 1;

Loading…
Cancel
Save