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

diff --git a/.gitignore b/.gitignore
index 0966e021dfefb3b552711f088a9192d1e0284d67..91e64f5084d61f4cc8099a4020191f71e4e5618a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 *.deb
 *.tar.gz
 webcit-*
+libcitadel-*
+citadel-*
+tmp

diff --git a/citadel/.gitignore b/citadel/.gitignore
index e7383ab6cb4a549720aed93a5d8d3184e01153d7..5c55734a17aea77503a1ffeaa93d2b28e8135067 100644 (file)
--- a/citadel/.gitignore
+++ b/citadel/.gitignore
@@ -33,3 +33,4 @@ sysdep.h.in
 userlist
 whobbs
 gmon.out
+autom4te.cache

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 25da56385f03b1ed6a3704719c9ed6d280fc1a8b..8b181852e140d219bec2ff4fc13795e6ca62d799 100755 (executable)
--- 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 a8b199a754385211dcdd82458f7d3da2f59d9160..b2692586e6d9e184c3b30147f8c41fb9ddd06734 100644 (file)
--- 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 5e63f87cefe507404d3f4f80996c220ae625381b..0766d401c2e2aaa324cd7bdf1ee3460777fe08fc 100755 (executable)
--- 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 8ca301b529d9e8d25fb7847041d7da3c15ae3d5a..8a066da6c7cb5157c60cba608ba04ef37905c51d 100755 (executable)
--- 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"