From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 2 Sep 2010 19:58:22 +0000 (+0200)
Subject: * moving directories around isn't smart in a git workingcopy. create symlinks & ignor... 
X-Git-Tag: v7.86~54
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=22dd0c4555e0c71b5e6b80277fd1018fdfcf5ee7

* moving directories around isn't smart in a git workingcopy. create symlinks & ignore them.
---

diff --git a/.gitignore b/.gitignore
index 0966e021d..91e64f508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 *.deb
 *.tar.gz
 webcit-*
+libcitadel-*
+citadel-*
+tmp
diff --git a/citadel/.gitignore b/citadel/.gitignore
index 0e71e9f8e..5c55734a1 100644
--- a/citadel/.gitignore
+++ b/citadel/.gitignore
@@ -32,3 +32,5 @@ sysdep.h
 sysdep.h.in
 userlist
 whobbs
+gmon.out
+autom4te.cache
diff --git a/citadel/buildpackages b/citadel/buildpackages
index 8cb0f70d7..e981ec4fd 100755
--- a/citadel/buildpackages
+++ b/citadel/buildpackages
@@ -29,8 +29,7 @@ else
 	fi
 	if test "$done" = "false"; then 
 		cd ..
-		mv -- $SYMLINK "citadel-$CITADEL_VERSION"
-		ln -sf "citadel-$CITADEL_VERSION" citadel
+		ln -sf citadel "citadel-$CITADEL_VERSION"
 		cd "citadel-$CITADEL_VERSION"
 	else
 		cd "../citadel-$CITADEL_VERSION"
diff --git a/libcitadel/.gitignore b/libcitadel/.gitignore
index a8b199a75..b2692586e 100644
--- a/libcitadel/.gitignore
+++ b/libcitadel/.gitignore
@@ -15,3 +15,4 @@ libcitadel.pc
 libtool
 sysdep.h
 sysdep.h.in
+autom4te.cache
diff --git a/libcitadel/buildpackages b/libcitadel/buildpackages
index 5e63f87ce..0766d401c 100755
--- a/libcitadel/buildpackages
+++ b/libcitadel/buildpackages
@@ -21,7 +21,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 +29,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"
diff --git a/webcit/buildpackages b/webcit/buildpackages
index 8ca301b52..8a066da6c 100755
--- a/webcit/buildpackages
+++ b/webcit/buildpackages
@@ -26,8 +26,7 @@ else
 	fi
 	if test "$done" = "false"; then 
 		cd ..
-		mv -- $SYMLINK "webcit-$WEBCIT_VERSION"
-		ln -sf "webcit-$WEBCIT_VERSION" webcit
+		ln -sf webcit "webcit-$WEBCIT_VERSION"
 		cd "webcit-$WEBCIT_VERSION"
 	else
 		cd "../webcit-$WEBCIT_VERSION"