From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Tue, 9 Apr 2019 16:01:46 +0000 (+0300)
Subject: build: rename guile variables to match upstream names
X-Git-Tag: gnutls_3_6_8~54^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cccdac73da310e2cb89f36abf0d839b73c098f9;p=thirdparty%2Fgnutls.git

build: rename guile variables to match upstream names

Reduce confusion between the upstream terms and the gnutls terms.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index 3814edf400..8ad597bfd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -833,15 +833,15 @@ AC_MSG_RESULT($opt_guile_bindings)
 
 AC_ARG_WITH(guile-site-dir, AS_HELP_STRING([--with-guile-site-dir=DIR],
     [guile site directory for gnutls, default is guile system settings]),
-    [guilemoduledir="${withval}"], [guilemoduledir='$(GUILE_SITE)'])
+    [guilesitedir="${withval}"], [guilesitedir='$(GUILE_SITE)'])
 AC_ARG_WITH(guile-site-ccache-dir, AS_HELP_STRING([--with-guile-site-ccache-dir=DIR],
     [guile ccache directory for gnutls, default is guile system settings]),
-    [guileobjectdir="${withval}"], [guileobjectdir='$(GUILE_SITE_CCACHE)'])
+    [guilesiteccachedir="${withval}"], [guilesiteccachedir='$(GUILE_SITE_CCACHE)'])
 AC_ARG_WITH(guile-extension-dir, AS_HELP_STRING([--with-guile-extension-dir=DIR],
     [guile extension directory for gnutls, default is guile system settings]),
     [guileextensiondir="${withval}"], [guileextensiondir='$(GUILE_EXTENSION)'])
-AC_SUBST([guilemoduledir])
-AC_SUBST([guileobjectdir])
+AC_SUBST([guilesitedir])
+AC_SUBST([guilesiteccachedir])
 AC_SUBST([guileextensiondir])
 
 if test "$opt_guile_bindings" = "yes"; then
diff --git a/guile/Makefile.am b/guile/Makefile.am
index cb9b7093c6..13bdeee774 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -22,10 +22,10 @@ SUBDIRS = src
 
 EXTRA_DIST = .dir-locals.el
 
-guilemodulesubdir = $(guilemoduledir)/gnutls
+guilesitesubdir = $(guilesitedir)/gnutls
 
-nodist_guilemodule_DATA = modules/gnutls.scm
-dist_guilemodulesub_DATA = modules/gnutls/extra.scm
+nodist_guilesite_DATA = modules/gnutls.scm
+dist_guilesitesub_DATA = modules/gnutls/extra.scm
 
 documentation_modules =				\
   modules/system/documentation/README		\
@@ -55,13 +55,13 @@ CLEANFILES = modules/gnutls.scm
 
 if HAVE_GUILD
 
-guileobjectsubdir = $(guileobjectdir)/gnutls
-nodist_guileobject_DATA = modules/gnutls.go
-nodist_guileobjectsub_DATA = modules/gnutls/extra.go
+guilesiteccachesubdir = $(guilesiteccachedir)/gnutls
+nodist_guilesiteccache_DATA = modules/gnutls.go
+nodist_guilesiteccachesub_DATA = modules/gnutls/extra.go
 
 GOBJECTS =					\
-  $(nodist_guileobject_DATA)			\
-  $(nodist_guileobjectsub_DATA)
+  $(nodist_guilesiteccache_DATA)		\
+  $(nodist_guilesiteccachesub_DATA)
 
 CLEANFILES += $(GOBJECTS)