* moving directories around isn't smart in a git workingcopy. create symlinks & ignor...
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 2 Sep 2010 19:58:22 +0000 (21:58 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 2 Sep 2010 19:58:22 +0000 (21:58 +0200)
.gitignore
citadel/.gitignore
citadel/buildpackages
libcitadel/.gitignore
libcitadel/buildpackages
webcit/buildpackages

index 0966e02..91e64f5 100644 (file)
@@ -4,3 +4,6 @@
 *.deb
 *.tar.gz
 webcit-*
+libcitadel-*
+citadel-*
+tmp
index e7383ab..5c55734 100644 (file)
@@ -33,3 +33,4 @@ sysdep.h.in
 userlist
 whobbs
 gmon.out
+autom4te.cache
index 25da563..8b18185 100755 (executable)
@@ -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"
index a8b199a..b269258 100644 (file)
@@ -15,3 +15,4 @@ libcitadel.pc
 libtool
 sysdep.h
 sysdep.h.in
+autom4te.cache
index 5e63f87..0766d40 100755 (executable)
@@ -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"
index 8ca301b..8a066da 100755 (executable)
@@ -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"