From 2a16aa91fec56559c6369f4bd4d703c1cf6817de Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Mon, 7 Sep 2020 17:48:37 +0200 Subject: [PATCH] [meson] Generate elinks.spec and changes in contrib --- configure.ac | 1 - contrib/conv/.gitignore | 1 - contrib/conv/{w3m2links.awk.in => w3m2links.awk} | 2 +- contrib/elinks.spec.in | 2 +- meson.build | 6 +++++- 5 files changed, 7 insertions(+), 5 deletions(-) rename contrib/conv/{w3m2links.awk.in => w3m2links.awk} (97%) mode change 100644 => 100755 diff --git a/configure.ac b/configure.ac index 30bc4c05..1252672e 100644 --- a/configure.ac +++ b/configure.ac @@ -1868,7 +1868,6 @@ AC_CONFIG_FILES([ \ Makefile.config \ contrib/elinks.spec \ contrib/lua/hooks.lua \ - contrib/conv/w3m2links.awk \ doc/Doxyfile \ doc/man/man1/elinks.1 \ src/intl/gettext/ref-add.sed \ diff --git a/contrib/conv/.gitignore b/contrib/conv/.gitignore index 43022620..e69de29b 100644 --- a/contrib/conv/.gitignore +++ b/contrib/conv/.gitignore @@ -1 +0,0 @@ -w3m2links.awk diff --git a/contrib/conv/w3m2links.awk.in b/contrib/conv/w3m2links.awk old mode 100644 new mode 100755 similarity index 97% rename from contrib/conv/w3m2links.awk.in rename to contrib/conv/w3m2links.awk index b5fa34af..f0033f4c --- a/contrib/conv/w3m2links.awk.in +++ b/contrib/conv/w3m2links.awk @@ -1,4 +1,4 @@ -#!@AWK@ -f +#!/bin/awk -f # # This converts w3m bookmarks.html to ELinks bookmarks.lst used by the Lua # based bookmarks handling (NOT the internal one!). diff --git a/contrib/elinks.spec.in b/contrib/elinks.spec.in index 361536bd..c4cc2e1b 100644 --- a/contrib/elinks.spec.in +++ b/contrib/elinks.spec.in @@ -193,7 +193,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 04 2002 pasky@ucw.cz - Changed some stuff so that it's now ready for inclusion.. -* Sat Mar 16 2002 zimon (ät) iki fi +* Sat Mar 16 2002 zimon (ät) iki fi - Made my own elinks.spec file as the one I found with Google didn't work how I wanted diff --git a/meson.build b/meson.build index 2440c959..dc2110b6 100644 --- a/meson.build +++ b/meson.build @@ -708,7 +708,10 @@ endif conf_data.set('ICONV_CONST', true) -conf_data.set('CONFDIR', get_option('prefix') / get_option('sysconfdir')/'elinks') +sysconfdir = get_option('prefix') / get_option('sysconfdir')/'elinks' +conf_data.set('CONFDIR', sysconfdir) +conf_data.set('sysconfdir', sysconfdir) +conf_data.set('SOMETHING', '@SOMETHING@') conf_data.set('LIBDIR', get_option('prefix') / 'lib') conf_data.set('LOCALEDIR', get_option('prefix') / 'share/locale') @@ -750,3 +753,4 @@ configure_file(input : 'config2.h.in', subdir('po') subdir('src') +subdir('contrib')