1 files changed, 35 insertions, 15 deletions

diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
index 62d53a99c0..9738f1a8c7 100644
--- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
+++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
@@ -8,29 +8,49 @@ https://gitlab.xfce.org/apps/xfce4-panel-profiles
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
- Makefile.in.in | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
+ Makefile.in.in | 15 ++++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.in.in b/Makefile.in.in
-index 73338f4..28a6c7b 100644
+index 73338f4..e08b218 100644
 --- a/Makefile.in.in
 +++ b/Makefile.in.in
-@@ -74,11 +74,10 @@ install: all xfce4-panel-profiles.1
+@@ -73,8 +73,11 @@ install: all xfce4-panel-profiles.1
+ 
         install -d $(DESTDIR)/$(MANDIR)/man1
         install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1
-        
+-       
 -       install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16,scalable}/apps
--       install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
--       install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
--       install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
--       install data/icons/scalable/org.xfce.PanelProfiles.svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
-+       install -D data/icons/128x128/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
-+       install -D data/icons/48x48/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
-+       install -D data/icons/16x16/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
-+       install -D data/icons/scalable/org.xfce.PanelProfiles.svg -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
++
++       install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
++       install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
++       install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
++       install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
+        install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
+        install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
+        install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
+@@ -86,7 +89,9 @@ uninstall:
+        rm -rf $(DESTDIR)/$(DOCDIR)
+        # FIXME: Uninstall locales
+        rm -f $(DESTDIR)/$(PREFIX)/bin/$(APPNAME)
+-       rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16}/apps/org.xfce.PanelProfiles.png
++       rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
++       rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
++       rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
+        rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/org.xfce.PanelProfiles.svg
  
- uninstall:
-        rm -f $(DESTDIR)/$(PREFIX)/share/applications/org.xfce.PanelProfiles.desktop
+ distcheck: all
+@@ -106,7 +112,9 @@ clean:
+        rm -f bin/$(APPNAME)
+        rm -f data/metainfo/org.xfce.PanelProfiles.appdata.xml
+        rm -f data/layouts/*.tar.bz2
+-       rm -f data/icons/{128x128,48x48,16x16}/org.xfce.panelprofiles.png
++       rm -f data/icons/128x128/org.xfce.panelprofiles.png
++       rm -f data/icons/48x48/org.xfce.panelprofiles.png
++       rm -f data/icons/16x16/org.xfce.panelprofiles.png
+        rm -f data/icons/scalable/org.xfce.panelprofiles.svg
+        rm -f org.xfce.PanelProfiles.desktop
+        rm -f Makefile.in
 -- 
 2.25.1