Fix cairo InstallDev and some package cleanups.

[openwrt/svn-archive/archive.git] / XOrg / generate.sh

diff --git a/XOrg/generate.sh b/XOrg/generate.sh
index f3d9da142ae755e55c8c174985c8db4d2e631f3f..9a99ba33d129377523ef73728b3873d46f29d571 100755 (executable)
--- a/XOrg/generate.sh
+++ b/XOrg/generate.sh
@@ -6,13 +6,15 @@ for d in `find . -name packages`; do
                _NAME=${p%%|*}
                NAME=${_NAME%-*}
                BASE_NAME=${NAME%%-*}
-               _VER=${_NAME##*-}
-               VER=${_VER%%|*}
+               VER=${_NAME##*-}
                DEP=`echo ${p##*|} | sed "s/+/ +/g"`
                echo generating Makefile for ${NAME}-${VER} with deps : ${DEP}
-               rm -rf ${NAME} 
-               if [ "$1" == "gen" ]; then
-                       mkdir ${NAME}
+               rm -f ${NAME}/Makefile
+        rm -f ${NAME}/patches/*
+               if [ "$1" = "gen" ]; then
+                       if [ ! -e ${NAME} ]; then
+                mkdir ${NAME}
+            fi
                        sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile
                        if [ -d `pwd`/patches/${NAME} ]; then
                                mkdir ${NAME}/patches