--- wm-icons-0.4.0.orig/Makefile.am +++ wm-icons-0.4.0/Makefile.am @@ -14,7 +14,7 @@ # is for a distribution package building. # Set the default icon set aliases (symlinks). install-data-local: - $(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet + $(DESTDIR)$(bindir)/wm-icons-config --user-dir="$(DESTDIR)$(icondir)" --defaults --quiet wm-configs _pack-symlinks _unpack-symlinks: cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@ --- wm-icons-0.4.0.orig/debian/changelog +++ wm-icons-0.4.0/debian/changelog @@ -0,0 +1,164 @@ +wm-icons (0.4.0-11) unstable; urgency=medium + + * Updated to standards version 4.3.0 (no changes required) + * Updated the VCS fields to point to salsa + * Bug fix: "Please drop olwm and olvwm from Enhances: list", thanks to + byang@debian.org; (Closes: #912903). Those packages are no longer + in Debian. + * Bug fix: "Vcs-* fields now invalid", thanks to Boyuan Yang (Closes: + #958799). Point them to Salsa + + -- Manoj Srivastava Tue, 12 May 2020 23:40:47 -0700 + +wm-icons (0.4.0-10) unstable; urgency=low + + * Updated to standards version 3.9.6 (no changes required) + * Updated the VCS fields in control to use https + * Moved to source format 1.0 and dgit + + -- Manoj Srivastava Mon, 25 Jan 2016 09:59:59 -0800 + +wm-icons (0.4.0-9) unstable; urgency=low + + * Bug fix: "/etc/menu-methods/wm-icons returned error status 1.", thanks + to Andreas Metzler. As Andreas points out, the content of + debian/$package.menu-method is not parsed as a list of files that will + be installed in /etc/menu-methods/ but it *is* the file being + installed. In this case, the file is not a static menu methods file, + but is generated at build time. I have now replaced the file as a + link, which will no longer be dangling after the package is built. + (Closes: #744341). + + -- Manoj Srivastava Sun, 13 Apr 2014 01:55:53 -0700 + +wm-icons (0.4.0-8) unstable; urgency=medium + + * Updated to the new policy version. No actual changes required + * Fix the VCS headers in control file to use the new format of URLs + * Upload Bug fix to unstable: "wrong code in postrm update-menu hook", + thanks to Ian Zimmerman (Closes: #618434). + * Use debcherry to minimize the patches being used. + + -- Manoj Srivastava Sat, 05 Apr 2014 15:09:50 -0700 + +wm-icons (0.4.0-7) experimental; urgency=low + + * Noticed and belatedly acknowledged the NMU from last year. Added back + the build depends from that. Thanks to Ralf Treinen + and Cyril Brulebois + + -- Manoj Srivastava Mon, 29 Apr 2013 11:04:14 -0700 + +wm-icons (0.4.0-6) experimental; urgency=low + + * New bug fixing release + * Bug fix: "wrong code in postrm update-menu hook", thanks to Ian + Zimmerman (Closes: #618434). + + -- Manoj Srivastava Sat, 27 Apr 2013 18:53:26 -0700 + +wm-icons (0.4.0-5.1) unstable; urgency=high + + * Non-maintainer upload. + * Add libtool to Build-Depends, thanks to Ralf Treinen (Closes: #659585). + * Set urgency to “high” for the RC bug fix. + * Thanks to IRILL for sponsoring this BSP in Paris. + + -- Cyril Brulebois Sat, 18 Feb 2012 18:15:22 +0000 + +wm-icons (0.4.0-5) unstable; urgency=low + + * A number of minor changes to fix small policy compliance issues. + + -- Manoj Srivastava Sun, 01 Nov 2009 17:23:02 -0600 + +wm-icons (0.4.0-4) unstable; urgency=low + + * [63f3b69]: [debiandir] Remove autogenerated files on clean + Remove all the files regenerated during build using autoconf from version + control. + * [630e580]: [debiandir] Use autoreconf instead of calling the commands + one by one + * [4c0f205]: Updated handling of parallel builds in DEB_BUILD_OPTIONS + to conform to policy. + * [529f0c4]: [autotools-cleanup] Remove files generated by autotools from VCS + + -- Manoj Srivastava Tue, 28 Apr 2009 17:21:02 -0500 + +wm-icons (0.4.0-3) unstable; urgency=low + + * Re-run autotools at build time. This gets away from the ancient + versions used by upstream, without bloating up the diff. + + -- Manoj Srivastava Mon, 02 Jun 2008 17:33:11 -0500 + +wm-icons (0.4.0-2) unstable; urgency=low + + * Record the fact that this package has moved to a new git repository. + * Move to the new, make -j friendly targets in debian/rules. + * Bug fix: "wm-icons: debian/watch fails to report upstream's + version", thanks to Raphael Geissert (Closes: #449686). + + -- Manoj Srivastava Mon, 02 Jun 2008 13:32:36 -0500 + +wm-icons (0.4.0-1) unstable; urgency=low + + * New upstream release + * New icon sets: 16x16-crystalclear, 48x48-crystalclear, 22x22-gartoon, + 48x48-gartoon, 32x32-gant, 64x64-gant. These are png icon sets. + * New icon sets: 24x24-infox, 48x48-infox. These are xpm icon sets. + * New icon sets: 16x16-aquafusion, 22x22-aquafusion, 32x32-aquafusion, + 48x48-aquafusion, 64x64-aquafusion. These are png icon sets. + * wm-icons now has a menu-methods script, that parses various menu files + and adds entries into an FVWM menu, complete with mini icons, for all + packages that register a mini icon. For themeable icons, if packages + register a bare icon name, this will search the current theme for the + appropriate icon. Not much support out there yet for this. + + -- Manoj Srivastava Mon, 17 Apr 2006 13:57:25 -0500 + +wm-icons (0.3.0-7) unstable; urgency=low + + * Bug fix: "Include arch-ids files", thanks to Julien Danjou + This is dues to the botched fixing of 283176 in the last + upload. Directories need to be removed with -rf (Closes: #300483). + + -- Manoj Srivastava Sun, 20 Mar 2005 13:15:02 -0600 + +wm-icons (0.3.0-6) unstable; urgency=low + + * Bug fix: "wm-icons: binary package includes GNU Arch id files", thanks + to Eric Wong (Closes: #283176). + + -- Manoj Srivastava Wed, 1 Dec 2004 14:20:57 -0600 + +wm-icons (0.3.0-5) unstable; urgency=low + + * Moved to the new build system, and arch. + + -- Manoj Srivastava Wed, 18 Feb 2004 23:41:38 -0600 + +wm-icons (0.3.0-4) unstable; urgency=low + + * use awk instead of gawk closes: Bug#188259 + + -- Manoj Srivastava Tue, 8 Apr 2003 17:32:45 -0500 + +wm-icons (0.3.0-3) unstable; urgency=low + + * No longer provide a /usr/doc symlink. Upgrade to latest polict version. + + -- Manoj Srivastava Mon, 11 Nov 2002 23:30:51 -0600 + +wm-icons (0.3.0-2) unstable; urgency=low + + * Move the sample configurations for window managers into the doc dir as + well. Oh, and I guess this fulfills the RFP, so closes: Bug#118428 + + -- Manoj Srivastava Mon, 25 Feb 2002 03:28:41 -0600 + +wm-icons (0.3.0-1) unstable; urgency=low + + * New version + + -- Manoj Srivastava Mon, 25 Feb 2002 01:10:09 -0600 --- wm-icons-0.4.0.orig/debian/clean +++ wm-icons-0.4.0/debian/clean @@ -0,0 +1,20 @@ + Makefile.in + acinclude.m4 + aclocal.m4 + bin/Makefile.in + config.guess + config.sub + configure + devel/Makefile.in + devel/bin/Makefile.in + devel/template/CVS/Entries + devel/template/CVS/Repository + devel/template/CVS/Root + doc/Makefile.in + etc/Makefile.in + etc/debian-menu-system/Makefile.in + icons/Makefile.in + install-sh + missing + mkinstalldirs + rpm/Makefile.in --- wm-icons-0.4.0.orig/debian/control +++ wm-icons-0.4.0/debian/control @@ -0,0 +1,33 @@ +Source: wm-icons +VCS-Git: https://salsa.debian.org/srivasta/wm-icons.git +VCS-Browser: https://salsa.debian.org/srivasta/wm-icons.git +Section: misc +Standards-Version: 4.3.0 +Maintainer: Manoj Srivastava +Priority: optional +Homepage: http://wm-icons.sourceforge.net/ +Build-Depends: debhelper-compat (=12) +Build-Depends-Indep: dh-autoreconf, autoconf, + automake | automaken, libtool, gettext (>= 0.18) + +Package: wm-icons +Architecture: all +Depends: ${misc:Depends} +Enhances: fvwm1, fvwm2, fvwm95, scwm, enlightenment, twm, flwm, + wmaker, sawfish-gnome, aewm, 9wm, blackbox, fluxbox, gwm, icewm, + larswm, ion, lwm, ratpoison, vtwm, w9wm, sawfish, sapphire, ctwm, + amiwm, pwm +Description: Themed icon set that is Window Manager agnostic + The Window Manager Icons is a set of generic icons for use by window + managers in a graphical environment. It is an efficient icon + distribution designed to be standardized and configurable. It + includes several themed icon sets, a template icon set to help + building new themed icon sets, scripts and configurations for several + window managers. + . + wm-icons comes with different styles and common window manager sizes + (small menu icons, larger desktop icons, etc.) as well as advice and + setup for integrating them with various window managers such as FVWM, + SCWM, etc. Each set consists of an icon in that size and style for + each of about 84 different generic categories ("game", "editor", + "file-manager", etc). --- wm-icons-0.4.0.orig/debian/copyright +++ wm-icons-0.4.0/debian/copyright @@ -0,0 +1,33 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: wm-icons +Source: http://wm-icons.sourceforge.net/ + +Files: * +Copyright: 1999, Julian Gilbey + 1999, Mikhael Goikhman +License: GPL-2.0+ +Comment: Changes: + added Debian GNU/Linux package maintenance system files, and a + manual page. + + +Files: debian/* +Copyright: 2002, 2003, 2004, 2005, 2006, 2013 Manoj Srivastava +License: GPL-2.0+ + +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". --- wm-icons-0.4.0.orig/debian/rules +++ wm-icons-0.4.0/debian/rules @@ -0,0 +1,47 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 +SRCTOP:= $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) +TMPTOP=$(SRCTOP)/debian/wm-icons +DOCDIR=$(TMPTOP)/usr/share/doc/wm-icons +INSTALL = install +ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +install_file = $(INSTALL) -p -o root -g root -m 644 +install_program = $(INSTALL) -p -o root -g root -m 755 +install_script = $(INSTALL) -p -o root -g root -m 755 +make_directory = $(INSTALL) -p -d -o root -g root -m 755 +package:=wm-icons +METHODSDIR = $(TMPTOP)/etc/menu-methods +METHODSLOC = $(TMPTOP)/etc/X11/fvwm/wm-icons + +%: + dh $@ --with autoreconf + +override_dh_auto_configure: + ac_cv_lib_util_getloadavg=no dh_auto_configure -- \ + --sysconfdir=/etc --enable-all-sets + +override_dh_install: + dh_install + (cd $(TMPTOP)/usr/share/icons/wm-icons/; \ + rm -f menu mini norm; \ + ln -s 16x16-general menu; \ + ln -s 14x14-general mini; \ + ln -s 48x48-general norm;) + +override_dh_installdocs: + $(make_directory) $(DOCDIR) + $(make_directory) $(METHODSDIR) + mv $(TMPTOP)/usr/share/wm-icons $(DOCDIR)/examples/ + $(install_file) $(DOCDIR)/examples/debian-menu-system/wm-icons.h \ + $(METHODSDIR)/ + $(install_file) $(DOCDIR)/examples/debian-menu-system/wm-icons-data.h \ + $(METHODSDIR)/ + rm -rf $(DOCDIR)/examples/debian-menu-system + dh_installdocs + +#Local variables: +#mode: makefile +#End: --- wm-icons-0.4.0.orig/debian/source/format +++ wm-icons-0.4.0/debian/source/format @@ -0,0 +1 @@ +1.0 --- wm-icons-0.4.0.orig/debian/source/lintian-overrides +++ wm-icons-0.4.0/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +wm-icons source: source-contains-cvs-control-dir devel/template/CVS +wm-icons source: debian-watch-may-check-gpg-signature --- wm-icons-0.4.0.orig/debian/watch +++ wm-icons-0.4.0/debian/watch @@ -0,0 +1,4 @@ +# format version number, currently 2; this line is compulsory! +version=3 + +opts="pgpmode=none" http://sf.net/wm-icons/wm-icons-(.+)\.tar\.bz2 --- wm-icons-0.4.0.orig/debian/wm-icons.docs +++ wm-icons-0.4.0/debian/wm-icons.docs @@ -0,0 +1,10 @@ +AUTHORS +NEWS +README +TODO +doc/FAQ +doc/icons.lst +doc/README.3dpixmaps +doc/README.martys +doc/README.penguins +doc/wm-icons.lsm --- wm-icons-0.4.0.orig/debian/wm-icons.lintian-overrides +++ wm-icons-0.4.0/debian/wm-icons.lintian-overrides @@ -0,0 +1,2 @@ +wm-icons: menu-method-should-include-menu-h etc/menu-methods/wm-icons-data.h +wm-icons: menu-method-should-include-menu-h etc/menu-methods/wm-icons.h --- wm-icons-0.4.0.orig/debian/wm-icons.menu-method +++ wm-icons-0.4.0/debian/wm-icons.menu-method @@ -0,0 +1,57 @@ +#!/usr/bin/install-menu +compat="menu-1" +!include lang.h +!include menu.h +# you may/should edit/check the systemFindIcon in wm-icons.h +!include wm-icons.h + +function ltitle()=translate($lang,title()) + +# if you want wm-icons only: +# replace "wmIconsFindIcon" by wmIconsFindIconWmOnly +# if you want that your system icons be prioritary for applications +# icons: +# replace "wmIconsFindIcon" by wmIconsSystemFindIcon" +# +# Do not forget to edit/check the systemFindIcon function in wm-icons.h +# +supported + wm= "+ \"" escfirst(ltitle(), $hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ + "\" Restart " $command "\n" + fvwm2module= "+ \"" escfirst(ltitle(), $hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ + "\" Module " $command "\n" + fvwm= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ + "\" " $command "\n" + fvwm2= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ + "\" " $command "\n" + x11= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ + "\" Exec " $command "\n" + text= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") "\"" \ + " Exec /usr/bin/X11/xterm -T \"" ltitle() "\" -e " $command "\n" +endsupported + +startmenu= "DestroyMenu \"" replacewith($section, " ", "_") "\"" "\n" \ + "AddToMenu \"" replacewith($section, " ", "_") "\"" \ + " \"" ltitle() "\" Title" "\n" +endmenu= "\n" + +# if you want wm-icons only: +# replace "wmIconsFindSectionIcon" by wmIconsFindSectionIconWmOnly +# in both case wm-icons are used for standard sections +# Do not forget to edit/check the systemFindIcon function in wm-icons.h +# +submenutitle= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ + cond_surr(wmIconsFindSectionIcon($section,$icon,"menu/"),"%","%") \ + "\" PopUp \"" replacewith($section, " ", "_") "\"\n" + +rootprefix="/etc/X11/fvwm/wm-icons/" +userprefix="/.fvwm/wm-icons/" +treewalk="c(m)" +genmenu="menudefs.hook" +rootsection="/DebianWmIcons" --- wm-icons-0.4.0.orig/etc/debian-menu-system/README +++ wm-icons-0.4.0/etc/debian-menu-system/README @@ -10,20 +10,14 @@ the "standard sections" and wm-icons icons and a map from packages name to wm-icons icons. -* wm-icons-fvwm2rc-menu is a menu-method script for FVWM. You should edit - the lines: - rootprefix="/usr/local/share/fvwm/debian-menu-system/" - userprefix="/.fvwm/debian-menu-system/" - replace "/usr/local/share/fvwm/" by the FVWM configuration directory - and ".fvwm" by the FVWM user directory. Then, you should add - Read debian-menu-system/wm-icons-menu +* wm-icons-fvwm2rc-menu is a menu-method script for FVWM. You should add + Read wm-icons/menudefs.hook in the configuration file and bind it in some ways e.g.: add: - + "menu system%menu/programs.xpm" Popup MenuFvwmDebianMenuSystem + + "menu system%menu/programs.xpm" Popup "/DebianWmIcons" in your root menu or add say: - Mouse 1 R A Menu MenuFvwmDebianMenuSystem - You should also use the configuration file "this dir"/../fvwm2rc + Mouse 1 R A Menu "/DebianWmIcons" * Other window managers: just (copy and rename and) edit the correponding menu methods script; you should add "!include wm-icons.h" and then you --- wm-icons-0.4.0.orig/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in +++ wm-icons-0.4.0/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in @@ -1,10 +1,11 @@ -#!/usr/sbin/install-menu +#!/usr/bin/install-menu compat="menu-1" +!include lang.h !include menu.h # you may/should edit/check the systemFindIcon in wm-icons.h !include wm-icons.h -function ltitle()=translate(lang(),title()) +function ltitle()=translate($lang,title()) # if you want wm-icons only: # replace "wmIconsFindIcon" by wmIconsFindIconWmOnly @@ -21,6 +22,9 @@ fvwm2module= "+ \"" escfirst(ltitle(), $hotkey,"&") \ cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ "\" Module " $command "\n" + fvwm= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ + cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ + "\" " $command "\n" fvwm2= "+ \"" escfirst(ltitle() ,$hotkey,"&") \ cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \ "\" " $command "\n" @@ -46,8 +50,8 @@ cond_surr(wmIconsFindSectionIcon($section,$icon,"menu/"),"%","%") \ "\" PopUp \"" replacewith($section, " ", "_") "\"\n" -rootprefix="/usr/local/share/fvwm/debian-menu-system/" -userprefix="/.fvwm/debian-menu-system/" +rootprefix="/etc/X11/fvwm/wm-icons/" +userprefix="/.fvwm/wm-icons/" treewalk="c(m)" -genmenu="wm-icons-menu" -rootsection="MenuFvwmDebianMenuSystem" +genmenu="menudefs.hook" +rootsection="/DebianWmIcons" --- wm-icons-0.4.0.orig/etc/debian-menu-system/wm-icons.h.in +++ wm-icons-0.4.0/etc/debian-menu-system/wm-icons.h.in @@ -13,13 +13,24 @@ # need to replace /urs/local/share/fvwm by "fvwm-themes @datadir@"/fvwm function systemFindIcon($filename)= \ ifeqelse($filename, "", "", \ + ifelsefile("/usr/share/icons/wm-icons/mini/" $filename, \ + "/usr/share/icons/wm-icons/mini/" $filename, \ ifelsefile("/usr/share/icons/mini/" $filename, \ - "/usr/share/icons/mini/" $filename, \ + "/usr/share/icons/mini/" $filename, \ + ifelsefile("/usr/share/icons/wm-icons/16x16-general/" $filename, \ + "/usr/share/icons/wm-icons/16x16-general/" $filename, \ + ifelsefile("/usr/share/icons/wm-icons/16x16-gnome/" $filename, \ + "/usr/share/icons/wm-icons/16x16-gnome/" $filename, \ + ifelsefile("/usr/share/icons/wm-icons/16x16-kde/" $filename, \ + "/usr/share/icons/wm-icons/16x16-kde/" $filename, \ + ifelsefile("/usr/share/fvwm-crystal/fvwm/icons/Default/" $filename, \ + "/usr/share/fvwm-crystal/fvwm/icons/Default/" $filename, \ ifelsefile("/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \ - "/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \ + "/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \ ifelsefile("/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename, \ - "/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename,\ - "")))) + "/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename, \ + ""))))))))) + # return the wm-icons associated to a standard section. If the section is # not standard return the "system/user" icons for this section and if not @@ -30,7 +41,7 @@ ifeqelse(systemFindIcon($i),"",\ ifeqelse(wmIconsGetSectionIcon(parent($s)),"",\ ifeqelse(wmIconsGetSectionIcon(parent(parent($s))),"",\ - $t "folder.xpm",\ + $t "folder.xpm",\ $t wmIconsGetSectionIcon(parent(parent($s)))),\ $t wmIconsGetSectionIcon(parent($s))),\ systemFindIcon($i)),\ @@ -41,7 +52,7 @@ ifeqelse(wmIconsGetSectionIcon($s),"",\ ifeqelse(wmIconsGetSectionIcon(parent($s)),"",\ ifeqelse(wmIconsGetSectionIcon(parent(parent($s))),"",\ - $t "folder.xpm",\ + $t "folder.xpm",\ $t wmIconsGetSectionIcon(parent(parent($s)))),\ $t wmIconsGetSectionIcon(parent($s))),\ $t wmIconsGetSectionIcon($s)) --- wm-icons-0.4.0.orig/icons/Makefile.am +++ wm-icons-0.4.0/icons/Makefile.am @@ -16,16 +16,16 @@ SYMLINKS_LST = _symlinks.lst install-data-local: - $(mkinstalldirs) $(icondir) + $(mkinstalldirs) $(DESTDIR)$(icondir) chmod -R o-w,go+rX * cd $(top_srcdir)/icons; \ for iconset in $(SELECTED_ICON_SETS); do \ - rm -rf $(icondir)/$$iconset; \ + rm -rf $(DESTDIR)$(icondir)/$$iconset; \ tar cpf - "$$iconset" \ - | (cd "$(icondir)" && tar xfBp -); \ - find "$(icondir)/$$iconset" -name CVS \ + | (cd "$(DESTDIR)$(icondir)" && tar xfBp -); \ + find "$(DESTDIR)$(icondir)/$$iconset" -name CVS \ -exec rm -r {} \; 2>/dev/null; \ - (cd "$(icondir)/$$iconset" && [ -f $(SYMLINKS_LST) ] \ + (cd "$(DESTDIR)$(icondir)/$$iconset" && [ -f $(SYMLINKS_LST) ] \ && $(AWK) '{ system("ln -sf " $$1 " " $$2) }' \ < $(SYMLINKS_LST) \ && rm $(SYMLINKS_LST) || true \ @@ -34,9 +34,9 @@ uninstall-local: for iconset in $(SELECTED_ICON_SETS); do \ - rm -rf $(icondir)/$$iconset; \ + rm -rf $(DESTDIR)$(icondir)/$$iconset; \ done - for i in $(icondir)/*; do \ + for i in $(DESTDIR)$(icondir)/*; do \ if [ -L "$$i" ] && [ ! -e "$$i" ]; then rm -f "$$i"; fi; \ done - -rmdir $(icondir) + -rmdir $(DESTDIR)$(icondir)