Merge pull request #1757 from ximion/master

A few Meson improvements

Author: gnunn1

data/man/Makefile.am

@@ -3,15 +3,15 @@ manfile = $(builddir)/man/man1/tilix.1.gz
 mansfiles = $(shell find $(srcdir)/po -name '*.man.po' | sed "s_$(srcdir)/po/\(.*\)\.man\.po_$(builddir)/man/\1/man1/tilix.1.gz_g")
 nobase_dist_mans_DATA = $(manfile) $(mansfiles)
 
-$(manfile): $(srcdir)/tilix
+$(manfile): $(srcdir)/tilix.1
 	$(INSTALL) -d $(@D); \
 	$(INSTALL) $< $(@D)/tilix.1; \
 	gzip -f $(@D)/tilix.1
 
 $(builddir)/man/%/man1/tilix.1.gz: $(srcdir)/po/%.man.po
 	$(INSTALL) -d "$(builddir)"/man/$(*F)/man1; \
-	$(PO4A_TRANS) -k 0 -f man -m "$(srcdir)"/tilix -p $< -l "$(builddir)"/man/$(*F)/man1/tilix.1; \
-	gzip -f "$(builddir)"/man/$(*F)/man1/tilix.1; 
+	$(PO4A_TRANS) -k 0 -f man -m "$(srcdir)"/tilix.1 -p $< -l "$(builddir)"/man/$(*F)/man1/tilix.1; \
+	gzip -f "$(builddir)"/man/$(*F)/man1/tilix.1;
 
-EXTRA_DIST = $(srcdir)/tilix $(srcdir)/po/*.man.po 
+EXTRA_DIST = $(srcdir)/tilix.1 $(srcdir)/po/*.man.po
 CLEANFILES = $(manfile) $(mansfiles)

data/man/tilix data/man/tilix.1data/man/tilix renamed to data/man/tilix.1

@@ -19,6 +19,9 @@ desktop_file = i18n.merge_file(
     install_dir: appdir
 )
 
+# Install manual page
+install_man(['man/tilix.1'])
+
 # Validate desktop file
 desktop_file_validate = find_program('desktop-file-validate', required:false)
 if desktop_file_validate.found()

data/meson.build

@@ -10,12 +10,8 @@ compiler = meson.get_compiler('d')
 
 message('Using compiler ' + compiler.get_id())
 
-if compiler.get_id() == 'gcc'
-    error('Tilix can not be compiled with GDC at time, since the standard library version of all GDC versions is currently (2016) too old. Sorry.')
-endif
-
- if compiler.get_id() == 'llvm'
-  extra_args = ['-vcolumns','-d-version=StdLoggerDisableTrace']
+if compiler.get_id() == 'llvm'
+  extra_args = ['-vcolumns']
   d_link_args = []
 else
   extra_args = []
@@ -119,6 +115,7 @@ executable('tilix',
                     xlib_dep,
                     libunwind_dep],
     d_args: extra_args,
+    d_module_versions: ['StdLoggerDisableTrace'],
     link_args: d_link_args,
     install : true
 )