summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-10-20 04:19:46 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-10-20 04:24:23 +0200
commit04db460623e1f235e7239f08fdcc2d0ef72636af (patch)
tree78b5f0620a370cfe3a17b8f2e7705aa09e72d333
parent4dd97fad9e0c3f39abfd16d13e5b4c93d508513c (diff)
downloadadmin-04db460623e1f235e7239f08fdcc2d0ef72636af.tar.gz
admin-04db460623e1f235e7239f08fdcc2d0ef72636af.zip
Fix automake icons installationr14.0.0
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--am_edit20
1 files changed, 11 insertions, 9 deletions
diff --git a/am_edit b/am_edit
index 98e3a83..6513778 100644
--- a/am_edit
+++ b/am_edit
@@ -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;