X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=ead78f4b03f4dcaf3d21b58132227bb45c1cddcd;hb=e610714ae71541cb38ea41f05477fcc8028b78b1;hp=f06fe4b5846469988c55468f9e0fd9714f68cc5c;hpb=02402ce569584b4c02ff042c17af54eb7d2dc9f8;p=moonshot-ui.git diff --git a/Makefile.am b/Makefile.am index f06fe4b..ead78f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -176,15 +176,15 @@ if OS_WIN32 ## A couple of Windows-specific targets: ## 1. Icons. You must have gnome-icon-theme and gnome-icon-theme-symbolic installed -## in c:/build prefix; and ImageMagick installed in c:/tools/ImageMagick. This +## in the install prefix; and ImageMagick installed in c:/tools/ImageMagick. This ## pulls in the icons required by moonshot and converts svg's to png's (we have ## no svg support built in to Windows Gtk+ right now). icons: mkdir -p share/icons - cp c:/build/share/icons/gnome/48x48/status/avatar-default.png share/icons - "${IMAGEMAGICK_CONVERT}" -background none c:/build/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png - "${IMAGEMAGICK_CONVERT}" -background none c:/build/share/icons/gnome/scalable/actions/edit-find-symbolic.svg -size 13x13 share/icons/edit-find-symbolic.png + cp ${prefix}/share/icons/gnome/48x48/status/avatar-default.png share/icons + "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png + "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-find-symbolic.svg -size 13x13 share/icons/edit-find-symbolic.png ## 2. Installer. You must have the Windows Installer XML toolkit version 3.5 @@ -197,6 +197,6 @@ installer: moonshot.msi moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS) "${WIX_CANDLE}" $< - "${WIX_LIGHT}" -b c:/build -b c:/tools/mingw -o moonshot.msi app.wixobj + "${WIX_LIGHT}" -b ${prefix} -b ${prefix}/mingw -o moonshot.msi app.wixobj endif