X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fbuild_appimage.sh;h=2c642ea21037d6e8d524257ec3845ccec9f77bd7;hb=8dc662496f6156cbfe7f49e392efa707572151bf;hp=6df62a4cec403daae84b9b9321dff5060bdca4b8;hpb=55ccbdf1cbb55d5c190072dbba32394fcf171d60;p=citadel.git

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 6df62a4ce..2c642ea21 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -6,6 +6,7 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 
 # libcitadel has to be built in a "real" library directory
 pushd ../libcitadel || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
 ./configure || exit 1
 make || exit 1
@@ -14,6 +15,7 @@ popd
 
 # Build the Citadel server
 pushd ../citadel || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
 ./configure --prefix=$CITADEL_BUILD_DIR || exit 1
 make || exit 1
@@ -22,6 +24,7 @@ popd
 
 # Build WebCit
 pushd ../webcit || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
 ./configure --prefix=$WEBCIT_BUILD_DIR || exit 1
 make || exit 1
@@ -57,12 +60,9 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1
 
 cpu=`uname -p`
+basefilename=citadel-`date +%s`
 if [ $cpu == x86_64 ] ; then
-	ARCH=x86_64 appimagetool citadel.AppDir/
-	md5sum Citadel-x86_64.AppImage | awk ' { print $1 } ' >Citadel-x86_64.AppImage.md5
+	ARCH=x86_64 appimagetool citadel.AppDir/ ${basefilename}-x64.appimage
 else
-	ARCH=ARM appimagetool citadel.AppDir/
-	md5sum Citadel-armhf.AppImage | awk ' { print $1 } ' >Citadel-armhf.AppImage.md5
+	ARCH=ARM appimagetool citadel.AppDir/ ${basefilename}-arm32.appimage
 fi
-
-