From: Art Cancro <ajc@citadel.org>
Date: Sat, 8 May 2021 23:19:16 +0000 (-0400)
Subject: ZZMerge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v939~58
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=35837c94bf87af75c35e8ceb1f1c55cc967e21aa

ZZMerge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

35837c94bf87af75c35e8ceb1f1c55cc967e21aa
diff --cc appimage/build_appimage.sh
index b52ee9a28,a1675de11..8613f4a21
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@@ -39,10 -39,9 +39,10 @@@ mkdir -p citadel.AppDir/usr/bi
  mkdir -p citadel.AppDir/usr/lib
  
  # Copy over all the libraries we used
- for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate
+ for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate `which gdb`
  do
 -	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 +	#for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 +	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' `
  	do
  		cp -v -L $x citadel.AppDir/usr/lib/
  	done