improve Makefile.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@366 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/Makefile b/rec10/trunk/src/Makefile
index 1c5f256..f4eb436 100644 (file)
--- a/rec10/trunk/src/Makefile
+++ b/rec10/trunk/src/Makefile
@@ -10,6 +10,7 @@ install:
        if ! [ -d $(PREFIX)/rec10 ]; then mkdir -p $(PREFIX)/rec10 ;fi
        cp ./*.py $(DEST)/
        cp ./*.xml $(DEST)/
+       echo "#!/bin/sh\nexport LANG=\"ja_JP.UTF-8\" && python2.6 ($PREFIX)/rec10" > ./rec10
        install -m755 ./rec10 $(DEST)/
        ln $(DEST)/rec10 /usr/local/bin
        chmod 755 /usr/local/bin/rec10
@@ -17,6 +18,6 @@ install:
        if ! [ -d /tmp/rec10 ]; then mkdir -p /tmp/rec10 ;fi
        chmod 777 /tmp/rec10
 uninstall:
-       rm -r $(DEST)
-       rm -r /tmp/rec10
-       rm /usr/local/bin/rec10
+       rm -rf $(DEST)
+       rm -rf /tmp/rec10
+       rm -f /usr/local/bin/rec10

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index a6d600d..2dc4a28 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -526,7 +526,8 @@ class DB_MySQL:
         Srec = 0
         Trec = 0
         db[1].execute(dbexe, (btime, etime,btime,etime))
-        for typet, bctypet, chtxtt, titlet in db[1].fetchall():
+        dbl=db[1].fetchall()
+        for typet, bctypet, chtxtt, titlet in dbl:
             if (typet == recdblist.REC_RESERVE) or (typet == recdblist.REC_FINAL_RESERVE) or (typet == recdblist.REC_KEYWORD) or (typet == recdblist.REC_KEYWORD_EVERY_SOME_DAYS):
                 if bctypet.find("cs") > -1:
                     Srec = Srec + 1

diff --git a/rec10/trunk/src/rec10 b/rec10/trunk/src/rec10
deleted file mode 100644 (file)
index b7ce394..0000000
--- a/rec10/trunk/src/rec10
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-SELF_DIR=`dirname $0`
-cd ${SELF_DIR}
-export LANG="ja_JP.UTF-8" && python2.6 ./rec10d.py
\ No newline at end of file