Fix automake icons installation

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 04db460623e1f235e7239f08fdcc2d0ef72636af)

1 files changed, 11 insertions, 9 deletions

diff --git a/am_edit b/am_edit
index 916b509..aa44633 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' => 'filesystems',
                '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;