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;