X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Fbuildpackages;h=b7b8ab01d176feb6b44e408e50753f90aabd2a78;hb=1a4ec92c7186ed2c0b9b6bf45afc47b69f3a800a;hp=7866949fda8fd6afa28bc67f92d2ea7527e3956e;hpb=37112123dab851033af01f3db95ce97857a158ff;p=citadel.git

diff --git a/libcitadel/buildpackages b/libcitadel/buildpackages
index 7866949fd..b7b8ab01d 100755
--- a/libcitadel/buildpackages
+++ b/libcitadel/buildpackages
@@ -6,9 +6,8 @@ fi
 
 ./bootstrap
 
-export `grep PACKAGE_VERSION= configure |sed -e "s;';;g" -e "s;PACKAGE;LIBCITADEL;"`
+export `grep PACKAGE_VERSION= configure |sed -e "s;';;g" -e "s;PACKAGE;LIBCITADEL;"  -e "s;4.;;"`
 
-PACKAGE_VERSION=`cat packageversion`
 DATE=`date '+%a, %d %b %Y %H:%I:00 %z'`
 ACTUAL_DIR=`pwd`
 
@@ -21,7 +20,7 @@ else
 	if test -L "$ACTUAL_DIR"; then 
 		SYMLINK_=`pwd`
 		SYMLINK=`ls -l $SYMLINK_|sed "s;.*-> ;;"`
-		if ls -l $SYMLINK_|grep -q "$LIBCITADEL_VERSION"; then
+		if ls -l $SYMLINK|grep -q "$LIBCITADEL_VERSION"; then
 			done=true
 		fi
 	else
@@ -29,8 +28,7 @@ else
 	fi
 	if test "$done" = "false"; then 
 		cd ..
-		mv -- $SYMLINK "libcitadel-$LIBCITADEL_VERSION"
-		ln -sf "libcitadel-$LIBCITADEL_VERSION" libcitadel
+		ln -sf libcitadel "libcitadel-$LIBCITADEL_VERSION" 
 		cd "libcitadel-$LIBCITADEL_VERSION"
 	else
 		cd "../libcitadel-$LIBCITADEL_VERSION"
@@ -102,17 +100,24 @@ EMAIL=citadel@outgesourced.org
 
 	;;
     sourcedist)
-	cd ..; tar --exclude .svn \
-	    --exclude "*svn*" \
-	    --exclude .libs \
+	cd ..; tar \
+	    --exclude ".gitignore" \
 	    --exclude "*.lo" \
+	    --exclude "*.o" \
 	    --exclude "*.d" \
+	    --exclude "autom4te.cache/*" \
 	    --exclude "debian/*" \
 	    --exclude "sysdep.h" \
 	    \
+	    --exclude .libs \
+	    --exclude tests/testdata \
+	    \
 	    -chvzf libcitadel-$LIBCITADEL_VERSION.tar.gz libcitadel-$LIBCITADEL_VERSION/
 	;;
+	version)
+		echo This would build libcitadel-$LIBCITADEL_VERSION
+		;;
 	*)
-		echo "Not yet implemented. we have: debian "
+		echo "Not yet implemented. we have: debian, sourcedist "
 		;;
 esac