Don't pollute global variables with "prefix"

Function declaration and call are on a single line because the line number is referenced by tests
Trepan-Debuggers · Oct 9, 2024 · 0a952da · 0a952da
1 parent 4aad514
commit 0a952da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bashdb-main.inc.in b/bashdb-main.inc.in
@@ -38,8 +38,8 @@ typeset _Dbg_orig_0=$0
 typeset _Dbg_pname=${0##*/}
 
 ## Stuff set by autoconf/configure ###
-typeset  prefix=@prefix@  # @PKGDATADIR@ often uses $prefix
-typeset _Dbg_libdir=@PKGDATADIR@
+# @PKGDATADIR@ often uses $prefix, _Dbg_libdir must be a global variable
+_Dbg_assign_libdir() { typeset prefix="@prefix@"; _Dbg_libdir="@PKGDATADIR@"; }; _Dbg_assign_libdir
 ###
 
 # We agonize a bit over _Dbg_libdir: the root directory for where

diff --git a/bashdb.in b/bashdb.in
@@ -49,8 +49,8 @@ typeset _Dbg_orig_0=$0
 typeset _Dbg_pname=${0##*/}
 
 ## Stuff set by autoconf/configure ###
-typeset  prefix=@prefix@  # @PKGDATADIR@ often uses $prefix
-typeset _Dbg_libdir="@PKGDATADIR@"
+# @PKGDATADIR@ often uses $prefix, _Dbg_libdir must be a global variable
+_Dbg_assign_libdir() { typeset prefix="@prefix@"; _Dbg_libdir="@PKGDATADIR@"; }; _Dbg_assign_libdir
 ###
 
 # We agonize a bit over _Dbg_libdir: the root directory for where