Makefile now installs desktop file and icons.

svn://old.homeip.net/code/mypaint@436

diff --git a/Makefile.am b/Makefile.am
index 8a21410..c57e222 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
 
+SUBDIRS= desktop
+
 defsdir = $(datadir)/pygtk/2.0/defs
 #pkgpyexecdir=$(pkglibdir)/pythonlib
 
@@ -20,7 +22,6 @@ avoid_version =
 # windows_flags =
 endif
 
-
 mydrawwidget_la_LDFLAGS = $(shared) $(no_undefined) $(common_ldflags) -module  -export-symbols-regex initmydrawwidget $(avoid_version)
 mydrawwidget_la_LIBADD = $(MYPAINT_LIBS) $(PYTHON_LIBS)
 

diff --git a/configure.in b/configure.in
index d0c0c87..9b22bfa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -151,5 +151,6 @@ AM_CONDITIONAL(NSIS_INSTALLER, test x"$nsis" = xyes)
 
 AC_OUTPUT([Makefile
          nsis/mypaint.nsi
+         desktop/Makefile
 ])
 

diff --git a/cross-configure.sh b/cross-configure.sh
index 10832ac..743105b 100755 (executable)
--- a/cross-configure.sh
+++ b/cross-configure.sh
@@ -5,8 +5,8 @@
 CONFIG_SHELL=/bin/sh
 export CONFIG_SHELL
 TARGET=i586-mingw32msvc
-CROSS_DEV=$HOME/Win32/mypaint_win32
-DLLZIP=$HOME/MyPaintDLL.zip
+CROSS_DEV=$HOME/Dev/Win32/98/mypaint_win32
+DLLZIP=$HOME/Dev/MyPaint/MyPaintDLL.zip
 PATH="$PATH:$CROSS_DEV/bin"
 export PATH
 

diff --git a/desktop/Makefile.am b/desktop/Makefile.am
new file mode 100644 (file)
index 0000000..7057b3d
--- /dev/null
+++ b/desktop/Makefile.am
@@ -0,0 +1,5 @@
+applicationdir=$(datadir)/applications/
+application_DATA = mypaint.desktop
+
+icondir=$(datadir)/pixmaps
+icon_DATA = mypaint_128.png mypaint_48.png
\ No newline at end of file