From 1d2ebc3eb5c445b37aaed29593dbe3246e4af813 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Fri, 10 Sep 2010 00:42:04 -0700
Subject: [PATCH] Install desktop on linux; compile in resource file on windows

---
 moo/medit-app/Makefile.incl | 19 +++++++++++++++++--
 moo/medit-app/medit.rc.in   |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/moo/medit-app/Makefile.incl b/moo/medit-app/Makefile.incl
index 75a1e2bf..2dd33f3d 100644
--- a/moo/medit-app/Makefile.incl
+++ b/moo/medit-app/Makefile.incl
@@ -34,9 +34,24 @@ if MOO_OS_WIN32
 medit_LDFLAGS += -mwindows
 endif
 
+EXTRA_DIST += medit-app/medit.rc.in
+if MOO_OS_WIN32
+CLEANFILES += medit-app/medit.rc medit-app/medit.res
+medit-app/medit.rc: medit-app/medit.rc.in $(top_builddir)/config.status
+	$(MKDIR_P) medit-app
+	cd $(top_builddir) && ./config.status --file=moo/medit-app/medit.rc
+medit-app/medit.res: medit-app/medit.rc
+	$(WINDRES) -i medit-app/medit.rc --input-format=rc -o medit-app/medit.res -O coff
+medit_LDADD += medit-app/medit.res
+endif
+
 EXTRA_DIST += medit-app/medit.desktop.in
-# desktopdir = $(datadir)/applications
-# desktop_DATA = medit.desktop.in
+if MOO_OS_UNIX
+desktopdir = $(datadir)/applications
+desktop_DATA = medit.desktop
+medit.desktop: medit-app/medit.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+	LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+endif MOO_OS_UNIX
 
 # MOO_WIN32_RESOURCE(medit.rc.in medit MEDIT_SOURCES medit_libs)
 
diff --git a/moo/medit-app/medit.rc.in b/moo/medit-app/medit.rc.in
index 6f5dbd84..8ab3d61b 100644
--- a/moo/medit-app/medit.rc.in
+++ b/moo/medit-app/medit.rc.in
@@ -1,6 +1,6 @@
 #include <windows.h>
 
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "@MOO_SOURCE_DIR@/moo/mooutils/pixmaps/medit.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "@top_srcdir@/moo/mooutils/pixmaps/medit.ico"
 
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
         VALUE "CompanyName", "http://mooedit.sourceforge.net/"
         VALUE "FileDescription", "medit"
-        VALUE "FileVersion", "@MOO_VERSION@.0"
+        VALUE "FileVersion", "@MOO_MAJOR_VERSION@.@MOO_MINOR_VERSION@.@MOO_MICRO_VERSION@.0"
         VALUE "InternalName", "medit"
         VALUE "LegalCopyright", "@MOO_COPYRIGHT@"
         VALUE "OriginalFilename", "medit.exe"