AUDIT: r16683 - gnucash/trunk - #503889: Improve r16678 when install icons according to spec.

[Andreas Köhler]

Author: andi5
Date: 2007-12-19 13:07:31 -0500 (Wed, 19 Dec 2007)
New Revision: 16683
Trac: http://svn.gnucash.org/trac/changeset/16683

Modified:
   gnucash/trunk/packaging/win32/dist.sh
   gnucash/trunk/src/pixmaps/Makefile.am
Log:
#503889: Improve r16678 when install icons according to spec.

Make it work for builddir != srcdir.  Do not distribute share\icons or
share\pixmaps on win32.
BP


Modified: gnucash/trunk/packaging/win32/dist.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist.sh	2007-12-19 17:38:57 UTC (rev 16682)
+++ gnucash/trunk/packaging/win32/dist.sh	2007-12-19 18:07:31 UTC (rev 16683)
@@ -183,7 +183,7 @@
     cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
     cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
     mkdir -p $DIST_UDIR/share
-    cp -a $_INSTALL_UDIR/share/{gnucash,locale,pixmaps,xml} $DIST_UDIR/share
+    cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
     cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
 
     _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `

Modified: gnucash/trunk/src/pixmaps/Makefile.am
===================================================================
--- gnucash/trunk/src/pixmaps/Makefile.am	2007-12-19 17:38:57 UTC (rev 16682)
+++ gnucash/trunk/src/pixmaps/Makefile.am	2007-12-19 18:07:31 UTC (rev 16683)
@@ -39,25 +39,25 @@
 gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
 gncnormalicon_DATA = 48x48/gnucash-icon.png
 48x48/gnucash-icon.png: gnucash-icon-48x48.png
-	-mkdir 48x48
-	cp gnucash-icon-48x48.png 48x48/gnucash-icon.png
+	-mkdir -p 48x48
+	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
 
 gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
 gncmediumicon_DATA = 32x32/gnucash-icon.png
 32x32/gnucash-icon.png: gnucash-icon-32x32.png
-	-mkdir 32x32
-	cp gnucash-icon-32x32.png 32x32/gnucash-icon.png
+	-mkdir -p 32x32
+	cp ${srcdir}/gnucash-icon-32x32.png 32x32/gnucash-icon.png
 
 gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
 gncsmallicon_DATA = 16x16/gnucash-icon.png
 16x16/gnucash-icon.png: gnucash-icon-16x16.png
-	-mkdir 16x16
-	cp gnucash-icon-16x16.png 16x16/gnucash-icon.png
+	-mkdir -p 16x16
+	cp ${srcdir}/gnucash-icon-16x16.png 16x16/gnucash-icon.png
 
 gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
 gncscalableicon_DATA = scalable/gnucash-icon.svg
 scalable/gnucash-icon.svg: ${top_srcdir}/art/icon.svgz
-	-mkdir scalable
+	-mkdir -p scalable
 	gzip -cd ${top_srcdir}/art/icon.svgz > scalable/gnucash-icon.svg
 
 # As suggested by <http://live.gnome.org/GnomeGoals/AppIcon>