Author: unknown <cnorman@.(none)>
Date:   Sat Jun  4 22:21:55 2011 -0700

Fixes to update the build ID in the about dialog, include the splash_screen.png 
in the windows NSIS install/uninstall scripts, and to reflect the change in the 
src tree.

Signed-off-by: Chris Norman <[email protected]>

---

 synfig-studio/build_tools/Makefile.am |    3 ++-
 synfig-studio/images/Makefile.am      |    4 ++++
 synfig-studio/win32inst.nsi.in        |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/synfig-studio/build_tools/Makefile.am 
b/synfig-studio/build_tools/Makefile.am
index fffc7a3..334beb1 100644
--- a/synfig-studio/build_tools/Makefile.am
+++ b/synfig-studio/build_tools/Makefile.am
@@ -9,6 +9,7 @@ all-local:
        touch $(top_builddir)/autorevision.h
 endif
 
+.PHONY: all-local
+
 clean-local:
        -rm -f $(top_builddir)/autorevision.h
-
diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index dcf0daa..c336f13 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -397,10 +397,14 @@ splash_screen_development.sif: 
$(srcdir)/splash_screen_development.sif.in
        sed "s|%branch%|$$branch|" $< | sed "s|%commit_date%|$$commit_date|" | 
sed "s|%commit_id%|$$commit_id|" | sed 
"s|synfig_icon.sif#|$(srcdir)/synfig_icon.sif#|" > $@
 splash_screen.$(EXT): splash_screen_development.sif
        $(SYNFIG) -q $< -o $@ --time 0
+       echo "  File \"images\\$@\"" >>./images.nsh
+       echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 .PHONY: splash_screen_development.sif
 else
 splash_screen.$(EXT): $(srcdir)/splash_screen-$(PACKAGE_VERSION).sif
        $(SYNFIG) -q $< -o $@ --time 0
+       echo "  File \"images\\$@\"" >>./images.nsh
+       echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 endif
 
 if !WIN32_PKG
diff --git a/synfig-studio/win32inst.nsi.in b/synfig-studio/win32inst.nsi.in
index a2aa784..82ac0b4 100644
--- a/synfig-studio/win32inst.nsi.in
+++ b/synfig-studio/win32inst.nsi.in
@@ -60,7 +60,7 @@ Section "Synfig Studio"
 
   SetOutPath "$INSTDIR\bin"
   File "src\synfigapp\.libs\libsynfigapp-0.dll"
-  File "src\gtkmm\.libs\synfigstudio.exe"
+  File "src\gui\.libs\synfigstudio.exe"
 
        FileOpen $0 $PROFILE\.gtkrc-2.0 a
        FileSeek $0 0 END


------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today. 
http://p.sf.net/sfu/quest-dev2dev2 
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to