Commit 925a1635 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

Redid the framework that deals with installing desktop files. Fixes bug

2005-06-16  Sven Neumann  <sven@gimp.org>

	Redid the framework that deals with installing desktop files.
	Fixes bug #307705:

	* data/misc/*: removed.

	* desktop/*: readded the desktop files in a new directory.

	* Makefile.am
	* configure.in
	* data/Makefile.am: changed accordingly.
parent 945ea318
2005-06-16 Sven Neumann <sven@gimp.org>
Redid the framework that deals with installing desktop files.
Fixes bug #307705:
* data/misc/*: removed.
* desktop/*: readded the desktop files in a new directory.
* Makefile.am
* configure.in
* data/Makefile.am: changed accordingly.
2005-06-16 Michael Natterer <mitch@gimp.org>
* tools/pdb/pdbgen/edit.pdb: revert accidential commit.
......
......@@ -11,6 +11,7 @@ SUBDIRS = \
po-plug-ins \
po-script-fu \
data \
desktop \
menus \
libgimpbase \
libgimpcolor \
......
......@@ -111,16 +111,6 @@ fi
AM_CONDITIONAL(GIMP_UNSTABLE, test "x$GIMP_UNSTABLE" = "xyes")
dnl Choose a desktop icon
if test "x$GIMP_UNSTABLE" = "xyes"; then
GIMP_DESKTOP_ICON="wilber-devel-icon.png"
else
GIMP_DESKTOP_ICON="wilber-icon.png"
fi
AC_SUBST(GIMP_DESKTOP_ICON)
# libtool versioning
m4_define([lt_current], [m4_eval(100 * gimp_minor_version + gimp_micro_version - gimp_interface_age)])
m4_define([lt_revision], [gimp_interface_age])
......@@ -1438,7 +1428,6 @@ else
DESKTOP_DATADIR="$datadir"
fi
AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
AC_SUBST(DESKTOP_DATADIR)
......@@ -1731,13 +1720,13 @@ data/environ/Makefile
data/gradients/Makefile
data/images/Makefile
data/interpreters/Makefile
data/misc/Makefile
data/misc/gimp.applications
data/misc/gimp.desktop.in
data/misc/gimp.keys
data/palettes/Makefile
data/patterns/Makefile
data/tips/Makefile
desktop/Makefile
desktop/gimp.applications
desktop/gimp.desktop.in
desktop/gimp.keys
etc/Makefile
m4macros/Makefile
po/Makefile.in
......
......@@ -6,7 +6,6 @@ SUBDIRS = \
gradients \
images \
interpreters \
misc \
palettes \
patterns \
tips
......
## Makefile.am for gimp/data/misc
miscdatadir = $(gimpdatadir)/misc
miscdata_in_files = gimp.desktop.in.in
miscdata_data_files = $(miscdata_in_files:.desktop.in.in=.desktop)
miscdata_DATA = \
$(miscdata_data_files) \
gimp.applications \
gimp.keys
EXTRA_DIST = \
$(miscdata_in_files) \
gimp.applications.in \
gimp.keys.in
gen_sources = desktop-foo
CLEANFILES = $(gen_sources)
DISTCLEANFILES = gimp.desktop
gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po)
sed -e 's|.[{]prefix[}]|${prefix}|' gimp.desktop.in > desktop-foo \
&& $(INTLTOOL_MERGE) $(top_srcdir)/po desktop-foo $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cachemake \
&& rm -r desktop-foo
install-data-local:
if DESKTOP_DATADIR
if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/applications \
&& rm -f gimp-@GIMP_APP_VERSION@.desktop \
&& $(LN_S) $(miscdatadir)/gimp.desktop gimp-@GIMP_APP_VERSION@.desktop \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \
&& rm -f gimp-@GIMP_APP_VERSION@.applications \
&& $(LN_S) $(miscdatadir)/gimp.applications gimp-@GIMP_APP_VERSION@.applications \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \
&& rm -f gimp-@GIMP_APP_VERSION@.keys \
&& $(LN_S) $(miscdatadir)/gimp.keys gimp-@GIMP_APP_VERSION@.keys \
; fi
endif
uninstall-local:
if DESKTOP_DATADIR
if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/applications \
&& rm -f gimp-@GIMP_APP_VERSION@.desktop \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \
&& rm -f gimp-@GIMP_APP_VERSION@.applications \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \
&& rm -f gimp-@GIMP_APP_VERSION@.keys \
; fi
endif
validate: gimp.desktop
( dfvalidate=`which desktop-file-validate`; \
if test x$$dfvalidate != x && test -x $$dfvalidate; then \
$$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
else \
echo "Can't find desktop-file-validate to validate $<; proceed with fingers crossed..."; \
fi )
dist-hook: validate
Makefile.in
Makefile
gimp.desktop
gimp.applications
gimp.desktop.in
gimp.desktop.in.in.h
gimp.desktop
gimp.keys
gimp.applications
.thumbnails
## Makefile.am for gimp/desktop
desktop_in_files = gimp.desktop.in.in
desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
applicationsdir = @DESKTOP_DATADIR@/applications
applications_DATA = $(desktop_files)
icondir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps
icon_DATA = gimp.png
mimeinfodir = @DESKTOP_DATADIR@/mime-info
mimeinfo_DATA = gimp.keys
registrydir = @DESKTOP_DATADIR@/application-registry
registry_DATA = gimp.applications
EXTRA_DIST = \
$(desktop_in_files) \
$(icon_DATA) \
$(mimeinfo_DATA) \
$(registry_DATA)
DISTCLEANFILES = $(desktop_files)
gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po)
$(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cachemake
validate: gimp.desktop
( dfvalidate=`which desktop-file-validate`; \
if test x$$dfvalidate != x && test -x $$dfvalidate; then \
$$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
else \
echo "Can't find desktop-file-validate to validate $<; proceed with fingers crossed..."; \
fi )
dist-hook: validate
This diff is collapsed.
......@@ -7,7 +7,7 @@ _GenericName=Image Editor
_Comment=Create images and edit photographs
Exec=gimp-remote-@GIMP_APP_VERSION@ %U
TryExec=gimp-@GIMP_APP_VERSION@
Icon=@gimpdatadir@/images/@GIMP_DESKTOP_ICON@
Icon=gimp.png
Terminal=false
Categories=Application;Graphics;2DGraphics;RasterGraphics;
X-GNOME-Bugzilla-Bugzilla=GNOME
......
......@@ -379,6 +379,6 @@ app/xcf/xcf-write.c
app/xcf/xcf-seek.c
app/xcf/xcf.c
data/misc/gimp.desktop.in.in
desktop/gimp.desktop.in.in
tools/gimp-remote.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment