'cpp',
version : run_command('./version.sh', check : true).stdout().strip(),
license : ['GPL-2.0-or-later'],
- meson_version : '>= 0.60.0',
- default_options : ['warning_level=0', 'buildtype=debugoptimized']
+ meson_version : '>=0.53.0',
+ default_options : ['warning_level=3', 'buildtype=debugoptimized']
)
+# To inhibit warnings from the generated files icons_inline.h and ui_icons.h
+add_global_arguments('-Wno-overlength-strings', language : 'c')
+
# Project requirements
project_sources = []
gnome = import('gnome')
gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true)
glib_genmarshal = find_program('glib-genmarshal', required : true)
gnome_doc_tool = find_program('yelp-build', required : false)
-if not gnome_doc_tool.found()
- message('yelp-build not found. Help files not created.')
+if gnome_doc_tool.found()
+ summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true)
+else
+ summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true)
endif
debug = get_option('debug')
icondir = join_paths(datadir, 'pixmaps')
mandir1 = join_paths(datadir, 'man', 'man1')
-podir = join_paths(meson.project_source_root(), 'po')
+podir = join_paths(meson.source_root(), 'po')
+
+summary({'gq_appdir': gq_appdir,
+ 'gq_bindir': gq_helpdir,
+ 'gq_helpdir': gq_helpdir,
+ 'gq_htmldir': gq_htmldir,
+ 'gq_localedir': gq_localedir,
+ }, section: 'Directories')
# Create the define constants used in the sources. Set via config.h.in
conf_data = configuration_data()
conf_data.set_quoted('VERSION', run_command('./version.sh', check : true).stdout())
conf_data.set('DEBUG', debug)
-if get_option('gtk3')
- gtk_dep = dependency('gtk+-3.0', version : '>=3.0', required: true)
-else
- gtk_dep = dependency('gtk+-2.0', version : '>=2.20', required: true)
-endif
-
-glib_dep = dependency('glib-2.0', version: '>=2.52', required: true)
+gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true)
+glib_dep = dependency('glib-2.0', version : '>=2.52', required: true)
libarchive_dep = []
-libarchive_dep = dependency('libarchive', version: '>=3.4.0', required : get_option('archive'))
-if libarchive_dep.found()
- conf_data.set('HAVE_ARCHIVE', 1)
-endif
-
-clutter_dep = []
-clutter_gtk_dep = []
-if get_option('gtk3')
- clutter_dep = dependency('clutter-1.0', required : get_option('clutter'))
- clutter_gtk_dep = dependency('clutter-gtk-1.0', required : get_option('clutter'))
- if clutter_dep.found() and clutter_gtk_dep.found()
- conf_data.set('HAVE_CLUTTER', 1)
+req_version = '>=3.4.0'
+option = get_option('archive')
+if not option.disabled()
+ libarchive_dep = dependency('libarchive', version : req_version, required : get_option('archive'))
+ if libarchive_dep.found()
+ conf_data.set('HAVE_ARCHIVE', 1)
+ summary({'archive' : ['archive files e.g. .zip supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'archive' : ['libarchive ' + req_version + ' not found - archive files e.g. .zip supported::', false]}, section : 'Configuration', bool_yn : true)
endif
+else
+ summary({'archive' : ['disabled - archive files e.g. .zip supported:', false]}, section : 'Configuration', bool_yn : true)
endif
lcms_dep = []
-lcms_dep = dependency('lcms2', version: '>=2.0', required : get_option('cms'))
-if lcms_dep.found()
- conf_data.set('HAVE_LCMS', 1)
- conf_data.set('HAVE_LCMS2', 1)
+req_version = '>=2.0'
+option = get_option('cms')
+if not option.disabled()
+ lcms_dep = dependency('lcms2', version : req_version, required : get_option('cms'))
+ if lcms_dep.found()
+ conf_data.set('HAVE_LCMS', 1)
+ conf_data.set('HAVE_LCMS2', 1)
+ summary({'cms' : ['color management supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'cms' : ['lcms2' + req_version + ' not found - color management supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'cms' : ['disabled - color management supported:', false]}, section : 'Configuration', bool_yn : true)
endif
ddjvuapi_dep = []
-ddjvuapi_dep = dependency('ddjvuapi', version: '>=3.5.27', required : get_option('djvu'))
-if ddjvuapi_dep.found()
- conf_data.set('HAVE_DJVU', 1)
+req_version = '>=2.5.27'
+option = get_option('djvu')
+if not option.disabled()
+ ddjvuapi_dep = dependency('ddjvuapi', version : req_version, required : get_option('djvu'))
+ if ddjvuapi_dep.found()
+ conf_data.set('HAVE_DJVU', 1)
+ summary({'djvu' : ['djvu files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'djvu' : ['ddjvuapi ' + req_version + ' not found - djvu files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'djvu' : ['disabled - djvu files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
exiv2_dep = []
-exiv2_dep = dependency('exiv2', version: '>=0.11', required : get_option('exiv2'))
-if exiv2_dep.found()
- conf_data.set('HAVE_EXIV2', 1)
+req_version = '>=0.11'
+option = get_option('exiv2')
+if not option.disabled()
+ exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
+ if exiv2_dep.found()
+ conf_data.set('HAVE_EXIV2', 1)
+ summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
endif
libffmpegthumbnailer_dep = []
-libffmpegthumbnailer_dep = dependency('libffmpegthumbnailer',
- version: '>=2.1.0',
- required : get_option('ffmpegthumbnailer'))
-
-if libffmpegthumbnailer_dep.found()
- conf_data.set('HAVE_FFMPEGTHUMBNAILER', 1)
-
- if cc.has_member('struct video_thumbnailer_struct', 'prefer_embedded_metadata',
- prefix : '#include <libffmpegthumbnailer/videothumbnailerc.h>')
-
- conf_data.set('HAVE_FFMPEGTHUMBNAILER_METADATA', 1)
- endif
-
- if cc.has_member('struct image_data_struct', 'image_data_width',
- prefix : '#include <libffmpegthumbnailer/videothumbnailerc.h>' )
-
- conf_data.set('HAVE_FFMPEGTHUMBNAILER_RGB', 1)
+req_version = '>=2.1.0'
+option = get_option('videothumbnailer')
+if not option.disabled()
+ libffmpegthumbnailer_dep = dependency('libffmpegthumbnailer',
+ version : req_version,
+ required : get_option('videothumbnailer'))
+
+ if libffmpegthumbnailer_dep.found()
+ conf_data.set('HAVE_FFMPEGTHUMBNAILER', 1)
+ summary({'videothumbnailer' : ['thumbnails of video files supported:', true]}, section : 'Configuration', bool_yn : true)
+
+ result = cc.has_member('struct video_thumbnailer_struct', 'prefer_embedded_metadata', prefix : '#include <libffmpegthumbnailer/videothumbnailerc.h>')
+ if result
+ conf_data.set('HAVE_FFMPEGTHUMBNAILER_METADATA', 1)
+ endif
+ summary({'fmpegthumbnailer_metadata' : ['fmpegthumbnailer_metadata found:', result]}, section : 'Thumbnailer', bool_yn : true)
+
+ result = cc.has_member('struct image_data_struct', 'image_data_width', prefix : '#include <libffmpegthumbnailer/videothumbnailerc.h>' )
+ if result
+ conf_data.set('HAVE_FFMPEGTHUMBNAILER_RGB', 1)
+ endif
+ summary({'fmpegthumbnailer_rgb' : ['fmpegthumbnailer_rgb found:', result]}, section : 'Thumbnailer', bool_yn : true)
+
+ result = cc.has_function('video_thumbnailer_set_size', dependencies : libffmpegthumbnailer_dep)
+ if result
+ conf_data.set('HAVE_FFMPEGTHUMBNAILER_WH', 1)
+ endif
+ summary({'fmpegthumbnailer_set_size' : ['fmpegthumbnailer_set_size found:', result]}, section : 'Thumbnailer', bool_yn : true)
+ else
+ summary({'videothumbnailer' : ['libvideothumbnailer ' + req_version + ' not found - thumbnails of video files supported', false]}, section : 'Configuration', bool_yn : true)
endif
-
- if cc.has_function('video_thumbnailer_set_size',
- dependencies : libffmpegthumbnailer_dep)
-
- conf_data.set('HAVE_FFMPEGTHUMBNAILER_WH', 1)
- endif
+else
+ summary({'videothumbnailer' : ['disabled -thumbnails of video files supported', false]}, section : 'Configuration', bool_yn : true)
endif
champlain_dep = []
champlain_gtk_dep = []
-if conf_data.has('HAVE_CLUTTER')
- champlain_dep = dependency('champlain-0.12', version: '>=0.12', required : get_option('gps-map'))
- champlain_gtk_dep = dependency('champlain-gtk-0.12', version: '>=0.12', required : get_option('gps-map'))
+clutter_dep = []
+clutter_gtk_dep = []
+req_version_champlain = '>=0.12'
+req_version_champlain_gtk = '>=0.12'
+req_version_clutter = '>=1.0'
+req_version_clutter_gtk = '>=1.0'
+option = get_option('gps-map')
+if not option.disabled()
+ champlain_dep = dependency('champlain-0.12', version : req_version_champlain, required : get_option('gps-map'))
+ champlain_gtk_dep = dependency('champlain-gtk-0.12', version : req_version_champlain_gtk, required : get_option('gps-map'))
if champlain_dep.found() and champlain_gtk_dep.found()
- conf_data.set('HAVE_LIBCHAMPLAIN', 1)
- conf_data.set('HAVE_LIBCHAMPLAIN_GTK', 1)
+ clutter_dep = dependency('clutter-1.0', version : req_version_clutter, required : get_option('gps-map'))
+ clutter_gtk_dep = dependency('clutter-gtk-1.0', version : req_version_clutter_gtk, required : get_option('gps-map'))
+ if clutter_dep.found() and clutter_gtk_dep.found()
+ conf_data.set('HAVE_CLUTTER', 1)
+ conf_data.set('HAVE_LIBCHAMPLAIN', 1)
+ conf_data.set('HAVE_LIBCHAMPLAIN_GTK', 1)
+ summary({'gps-map' : ['GPS map displayed', true]}, section : 'Configuration', bool_yn : true)
+ else
+ if not clutter_dep.found()
+ summary({'gps-map-clutter' : ['clutter-1.0 ' + req_version_clutter + ' not found - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+ if not clutter_gtk_dep.found()
+ summary({'gps-map-clutter-gtk' : ['clutter-gtk-1.0 ' + req_version_clutter_gtk + ' not found - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+ endif
+ else
+ if not champlain_dep.found()
+ summary({'gps-map-champlain' : ['champlain-0.12 ' + req_version_champlain + ' not found - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+ if not champlain_gtk_dep.found()
+ summary({'gps-map-champlain-gtk' : ['champlain-gtk-0.12 ' + req_version_champlain_gtk + ' not found - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true)
+ endif
endif
+else
+ summary({'gps-map' : ['disabled - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true)
endif
libheif_dep = []
-libheif_dep = dependency('libheif', version: '>=1.3.2', required : get_option('heif'))
-if libheif_dep.found()
- conf_data.set('HAVE_HEIF', 1)
+req_version = '>=1.3.2'
+option = get_option('heif')
+if not option.disabled()
+ libheif_dep = dependency('libheif', version : req_version, required : get_option('heif'))
+ if libheif_dep.found()
+ conf_data.set('HAVE_HEIF', 1)
+ summary({'heif' : ['heif files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'heif' : ['libheif ' + req_version + ' not found - heif files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'heif' : ['disabled - heif files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
libopenjp2_dep = []
-libopenjp2_dep = dependency('libopenjp2', version: '>=2.3.0', required : get_option('j2k'))
-if libopenjp2_dep.found()
- conf_data.set('HAVE_J2K', 1)
+req_version = '>=2.3.0'
+option = get_option('j2k')
+if not option.disabled()
+ libopenjp2_dep = dependency('libopenjp2', version : req_version, required : get_option('j2k'))
+ if libopenjp2_dep.found()
+ conf_data.set('HAVE_J2K', 1)
+ summary({'j2k' : ['j2k files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'j2k' : ['libopenjp2 ' + req_version + ' not found - j2k files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'j2k' : ['disabled - j2k files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
libjpeg_dep = []
+option = get_option('jpeg')
+if not option.disabled()
libjpeg_dep = dependency('libjpeg', required : get_option('jpeg'))
-if libjpeg_dep.found()
- if cc.has_function('jpeg_destroy_decompress',
- dependencies : libjpeg_dep)
-
- conf_data.set('HAVE_JPEG', 1)
+ if libjpeg_dep.found()
+ if cc.has_function('jpeg_destroy_decompress', dependencies : libjpeg_dep)
+ conf_data.set('HAVE_JPEG', 1)
+ summary({'jpeg' : ['jpeg files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'jpeg' : ['jpeg_destroy_decompress not found - jpeg files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+ else
+ summary({'jpeg' : ['libjpeg: not found', false]}, section : 'Configuration', bool_yn : true)
endif
+else
+ summary({'jpeg' : ['disabled - jpeg files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
libjxl_dep = []
-libjxl_dep = dependency('libjxl', version: '>=0.3.7', required : get_option('jpegxl'))
-if libjxl_dep.found()
- conf_data.set('HAVE_JPEGXL', 1)
+req_version = '>=0.3.7'
+option = get_option('jpegxl')
+if not option.disabled()
+ libjxl_dep = dependency('libjxl', version : req_version, required : get_option('jpegxl'))
+ if libjxl_dep.found()
+ conf_data.set('HAVE_JPEGXL', 1)
+ summary({'jpegxl' : ['jpegxl files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'jpegxl' : ['libjxl ' + req_version + ' not found - jpegxl files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'jpegxl' : ['disabled - jpegxl files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
libraw_dep = []
-libraw_dep = dependency('libraw', version: '>=0.20', required : get_option('libraw'))
-if libraw_dep.found()
- conf_data.set('HAVE_RAW', 1)
-endif
-
-lirc_dep = []
-lirc_dep = dependency('lirc', version: '>=0.6.1', required : get_option('lirc'))
-if lirc_dep.found()
- conf_data.set('HAVE_LIRC', 1)
+req_version = '>=0.20'
+option = get_option('libraw')
+if not option.disabled()
+ libraw_dep = dependency('libraw', version : req_version, required : get_option('libraw'))
+ if libraw_dep.found()
+ conf_data.set('HAVE_RAW', 1)
+ summary({'libraw' : ['.cr3 files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'libraw' : ['libraw ' + req_version + ' not found - .cr3 files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'libraw' : ['disabled - .cr3 files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
lua_dep = []
-lua_dep = dependency('lua5.1', required : get_option('lua'))
-if lua_dep.found()
- conf_data.set('HAVE_LUA', 1)
+req_version = '>=5.3'
+option = get_option('lua')
+if not option.disabled()
+ lua_dep = dependency('lua5.3', version : req_version, required : get_option('lua'))
+ if lua_dep.found()
+ conf_data.set('HAVE_LUA', 1)
+ summary({'lua' : ['lua supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'lua' : ['lua5.3 ' + req_version + ' not found - lua supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+else
+ summary({'lua' : ['disabled - lua supported:', false]}, section : 'Configuration', bool_yn : true)
endif
poppler_glib_dep = []
-if get_option('gtk3')
- poppler_glib_dep = dependency('poppler-glib', version: '>=0.62', required : get_option('pdf'))
+req_version = '>=0.62'
+option = get_option('pdf')
+if not option.disabled()
+ poppler_glib_dep = dependency('poppler-glib', version : req_version, required : get_option('pdf'))
if poppler_glib_dep.found()
conf_data.set('HAVE_PDF', 1)
+ summary({'pdf' : ['pdf files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'pdf' : ['poppler-glib ' + req_version + ' not found - pdf files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+else
+ summary({'pdf' : ['disabled - pdf files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
gspell_dep = []
-if get_option('gtk3')
- gspell_dep = dependency('gspell-1', required: get_option('spell'))
+req_version = '>=1.6'
+option = get_option('spell')
+if not option.disabled()
+ gspell_dep = dependency('gspell-1', version : req_version, required: get_option('spell'))
if gspell_dep.found()
conf_data.set('HAVE_SPELL', 1)
+ summary({'spell' : ['spelling checks enabled', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'spell' : ['gspell-1 ' + req_version + ' not found - spelling checks not enabled', false]}, section : 'Configuration', bool_yn : true)
endif
+else
+ summary({'spell' : ['disabled - spelling checks not enabled', false]}, section : 'Configuration', bool_yn : true)
endif
tiff_dep = []
-tiff_dep = cc.find_library('tiff', required: get_option('tiff'))
-if tiff_dep.found()
- if cc.has_function('TIFFClientOpen',
- dependencies : tiff_dep)
-
- conf_data.set('HAVE_TIFF', 1)
+option = get_option('tiff')
+if not option.disabled()
+ tiff_dep = cc.find_library('libtiff', required: get_option('tiff'))
+ if tiff_dep.found()
+ if cc.has_function('TIFFClientOpen', dependencies : tiff_dep)
+ conf_data.set('HAVE_TIFF', 1)
+ summary({'tiff' : ['tiff files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'tiff' : ['TIFFClientOpen not found - tiff files supported:', false]}, section : 'Configuration', bool_yn : true)
+ endif
+ else
+ summary({'tiff' : ['libtiff not found - tiff files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+else
+ summary({'tiff' : ['disabled - tiff files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
libwebp_dep = []
- libwebp_dep = dependency('libwebp', version: '>=0.6.1', required : get_option('webp'))
+req_version = '>=0.6.1'
+option = get_option('webp')
+if not option.disabled()
+ libwebp_dep = dependency('libwebp', version : req_version, required : get_option('webp'))
if libwebp_dep.found()
conf_data.set('HAVE_WEBP', 1)
+ summary({'webp' : ['webp files supported:', true]}, section : 'Configuration', bool_yn : true)
+ else
+ summary({'webp' : ['libwebp ' + req_version + ' not found - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+else
+ summary({'webp' : ['disabled - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
+endif
# Check for nl_langinfo and _NL_TIME_FIRST_WEEKDAY
code = '''#include <langinfo.h>
}'''
if cc.links(code, name : 'nl_langinfo and _NL_TIME_FIRST_WEEKDAY')
conf_data.set('HAVE__NL_TIME_FIRST_WEEKDAY', 1)
+ summary({'nl_langinfo' : ['first weekday depends on locale:', true]}, section : 'Documentation', bool_yn : true)
+else
+ summary({'nl_langinfo' : ['nl_langinfo not found - first weekday depends on locale:', false, 'first weekday defaults to Monday']}, section : 'Documentation', bool_yn : true)
endif
conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
subdir('po')
subdir('plugins')
-# Generate the executable and the help files
+# Generate the executable
subdir('src')
+
+# Generate the help files
subdir('doc')
# Install other project files
-run_command(find_program('gen_changelog.sh'), meson.project_source_root(), meson.project_build_root(), check : true)
+res = run_command(find_program('gen_changelog.sh'), meson.source_root(), meson.build_root(), check : false)
-run_command(find_program('gen_readme.sh'), meson.project_source_root(), meson.project_build_root(), check : true)
+if res.returncode() == 0
+ install_data(join_paths(meson.build_root(), 'ChangeLog'), join_paths(meson.build_root(), 'ChangeLog.html'), install_dir : helpdir)
+ summary({'ChangeLog' : ['ChangeLog, ChangeLog.html created:', true]}, section : 'Documentation', bool_yn : true)
+else
+ summary({'ChangeLog' : ['ChangeLog, ChangeLog.html created:', false]}, section : 'Documentation', bool_yn : true)
+endif
-pandoc = find_program('pandoc')
+pandoc = find_program('pandoc', required : false)
if pandoc.found()
- install_data('README.md', 'COPYING', join_paths(meson.project_build_root(), 'ChangeLog'), 'TODO', 'README.lirc', 'AUTHORS', join_paths(meson.project_build_root(), 'README.html'), join_paths(meson.project_build_root(), 'ChangeLog.html'), install_dir : helpdir, install_tag : 'help')
+ run_command(find_program('gen_readme.sh'), meson.source_root(), meson.build_root(), check : false)
+
+ install_data('README.md', 'COPYING', 'TODO', 'AUTHORS',
+ join_paths(meson.build_root(), 'README.html'),
+ install_dir : helpdir)
+ summary({'README' : ['README.html created:', true]}, section : 'Documentation', bool_yn : true)
+else
+ install_data('README.md', 'COPYING', 'TODO', 'AUTHORS',
+ install_dir : helpdir)
+ summary({'README' : ['pandoc not found - README.html created:', false]}, section : 'Documentation', bool_yn : true)
+endif
+
+evince = find_program('evince', required : false)
+if evince.found()
+ summary({'print preview' : ['print preview supported:', true]}, section : 'Documentation', bool_yn : true)
else
- install_data('README.md', 'COPYING', join_paths(meson.project_build_root(), 'ChangeLog'), 'TODO', 'README.lirc', 'AUTHORS', install_dir : helpdir, install_tag : 'help')
+ summary({'print preview' : ['evince not found - print preview supported:', false]}, section : 'Documentation', bool_yn : true)
endif
-install_data('geeqie.png', install_dir : icondir, install_tag : 'icons')
-install_data('geeqie.1', install_dir : mandir1, install_tag : 'man')
+install_data('geeqie.png', install_dir : icondir)
+install_data('geeqie.1', install_dir : mandir1)
i18n.merge_file(
input : 'geeqie.desktop.in',