Commit 0e3631ec authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

INSTALL configure.in allow to skip installation of desktop files by

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

	* INSTALL
	* configure.in
	* desktop/Makefile.am: allow to skip installation of desktop files
	by passing --without-desktop-dir.
parent 925a1635
2005-06-16 Sven Neumann <sven@gimp.org>
* INSTALL
* configure.in
* desktop/Makefile.am: allow to skip installation of desktop files
by passing --without-desktop-dir.
2005-06-16 Sven Neumann <sven@gimp.org>
Redid the framework that deals with installing desktop files.
......
......@@ -162,12 +162,11 @@ These are:
because configure tries to find it in the usual places.
--with-desktop-dir=[PATH]. This option specifies where to install
links to the gimp desktop files. These files are used by desktop
environments that comply to the specs published at freedesktop.org.
The default value ${prefix}/share should be fine if your desktop
environment is installed in the same prefix as gimp. No links are
created if the desktop directories don't exist or you used
--without-desktop-dir.
desktop files. These files are used by desktop environments that
comply to the specs published at freedesktop.org. The default
value ${prefix}/share should be fine if your desktop environment
is installed in the same prefix as gimp. No files are installed
if you call configure with --without-desktop-dir.
--disable-default-binary. Use this option if you don't want to make
gimp-2.3 the default gimp installation. Otherwise a link called
......
......@@ -1428,6 +1428,7 @@ else
DESKTOP_DATADIR="$datadir"
fi
AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
AC_SUBST(DESKTOP_DATADIR)
......
......@@ -6,29 +6,31 @@ 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
registrydir = @DESKTOP_DATADIR@/application-registry
mimeinfodir = @DESKTOP_DATADIR@/mime-info
mimeinfo_DATA = gimp.keys
if DESKTOP_DATADIR
applications_DATA = $(desktop_files)
registrydir = @DESKTOP_DATADIR@/application-registry
icon_DATA = gimp.png
mimeinfo_DATA = gimp.keys
registry_DATA = gimp.applications
endif
EXTRA_DIST = \
$(desktop_in_files) \
$(icon_DATA) \
$(mimeinfo_DATA) \
$(registry_DATA)
gimp.applications.in \
gimp.desktop.in.in \
gimp.keys.in \
gimp.png
DISTCLEANFILES = $(desktop_files)
......
This diff is collapsed.
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