Description: Move icons to a themeable location Author: Marc Deslauriers <marc.deslauriers@ubuntu.com> diff -Nur -x '*.orig' -x '*~' gnome-ppp-0.3.23/build-tree/gnome-ppp-0.3.23/pixmaps/Makefile.am gnome-ppp-0.3.23.new/build-tree/gnome-ppp-0.3.23/pixmaps/Makefile.am --- gnome-ppp-0.3.23/pixmaps/Makefile.am 2004-11-08 06:08:58.000000000 -0500 +++ gnome-ppp-0.3.23/pixmaps/Makefile.am 2011-06-14 14:02:20.132752432 -0400 @@ -1,8 +1,8 @@ appicondir = $(PACKAGE_APPICON_DIR) -appicon_DATA = gnome-ppp.png -pkgdata_DATA = gnome_ppp_idle.png \ +appicon_DATA = gnome-ppp.png \ + gnome_ppp_idle.png \ gnome_ppp_receiving.png \ gnome_ppp_sending.png \ gnome_ppp_sending_receiving.png -EXTRA_DIST = $(appicon_DATA) $(pkgdata_DATA) +EXTRA_DIST = $(appicon_DATA) diff -Nur -x '*.orig' -x '*~' gnome-ppp-0.3.23/build-tree/gnome-ppp-0.3.23/pixmaps/Makefile.in gnome-ppp-0.3.23.new/build-tree/gnome-ppp-0.3.23/pixmaps/Makefile.in --- gnome-ppp-0.3.23/pixmaps/Makefile.in 2011-06-14 14:01:31.492752444 -0400 +++ gnome-ppp-0.3.23/pixmaps/Makefile.in 2011-06-14 14:04:12.882752407 -0400 @@ -17,7 +17,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. @@ -53,10 +52,9 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(appicondir)" appiconDATA_INSTALL = $(INSTALL_DATA) -pkgdataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(appicon_DATA) $(pkgdata_DATA) +DATA = $(appicon_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -202,13 +200,13 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ appicondir = $(PACKAGE_APPICON_DIR) -appicon_DATA = gnome-ppp.png -pkgdata_DATA = gnome_ppp_idle.png \ +appicon_DATA = gnome-ppp.png \ + gnome_ppp_idle.png \ gnome_ppp_receiving.png \ gnome_ppp_sending.png \ gnome_ppp_sending_receiving.png -EXTRA_DIST = $(appicon_DATA) $(pkgdata_DATA) +EXTRA_DIST = $(appicon_DATA) all: all-am .SUFFIXES: @@ -268,23 +266,6 @@ echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \ rm -f "$(DESTDIR)$(appicondir)/$$f"; \ done -install-pkgdataDATA: $(pkgdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ - $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ - done - -uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ - done tags: TAGS TAGS: @@ -323,7 +304,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(appicondir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -368,7 +349,7 @@ info-am: -install-data-am: install-appiconDATA install-pkgdataDATA +install-data-am: install-appiconDATA install-exec-am: @@ -394,19 +375,18 @@ ps-am: -uninstall-am: uninstall-appiconDATA uninstall-info-am \ - uninstall-pkgdataDATA +uninstall-am: uninstall-appiconDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-appiconDATA install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ - install-pkgdataDATA install-strip installcheck installcheck-am \ + install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am uninstall uninstall-am uninstall-appiconDATA \ - uninstall-info-am uninstall-pkgdataDATA + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.