Browse Source

Fix automake icons installation

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
tags/r14.0.0^0
Slávek Banko 4 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()
1528 1528
             my $type = $prefix;
1529 1529
             $type =~ s/^.*-([^-]+)$/$1/;
1530 1530
             $prefix =~ s/^(.*)-[^-]+$/$1/;
1531
-            
1531
+
1532 1532
             my %type_hash =
1533 1533
               (
1534 1534
                'action' => 'actions',
1535 1535
                'app' => 'apps',
1536
+               'category' => 'categories',
1536 1537
                'device' => 'devices',
1537 1538
                'filesys' => 'places',
1538 1539
                'mime' => 'mimetypes'
@@ -1580,15 +1581,16 @@ sub tag_ICON()
1580 1581
                 print STDERR "unknown icon prefix $prefix in $printname\n";
1581 1582
                 next;
1582 1583
             }
1583
-            
1584
+
1584 1585
             my $dir = $dir_hash{$prefix} . "/" . $type_hash{$type};
1585
-            if ($newfile =~ /-[^\.]/) {
1586
-                my $tmp = $newfile;
1587
-                $tmp =~ s/^([^-]+)-.*$/$1/;
1588
-                $dir = $dir . "/" . $tmp;
1589
-                $newfile =~ s/^[^-]+-//;
1590
-            }
1591
-            
1586
+            #-- does not convert from dashes to folders inside icon names
1587
+            #if ($newfile =~ /-[^\.]/) {
1588
+            #    my $tmp = $newfile;
1589
+            #    $tmp =~ s/^([^-]+)-.*$/$1/;
1590
+            #    $dir = $dir . "/" . $tmp;
1591
+            #    $newfile =~ s/^[^-]+-//;
1592
+            #}
1593
+
1592 1594
             if (!defined $directories{$dir}) {
1593 1595
                 $install .= "\t\$(mkinstalldirs) \$(DESTDIR)\$($destdir)/$dir\n";
1594 1596
                 $directories{$dir} = 1;

Loading…
Cancel
Save