Cleanup in root folder

6 files changed, 32 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cfc546..10005e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} )
 SET ( CMAKE_INSTALL_DOCDIR ${CMAKE_DOC_PATH} )
 # uninstall
 CONFIGURE_FILE (
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY )
 ADD_CUSTOM_TARGET ( uninstall "${CMAKE_COMMAND}" 
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index 2fa707b..0000000
--- a/clean.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
- 
-# remove compiled files
-[ -e "[Mm]akefile" ] && make clean
-
-# remove folders
-find ./ -type d -name CMakeFiles -print | xargs -i rm {} -rf
-# some people build Tuxanci in speacial folder
-rm -rf ./build
-
-# remove cmake files
-find ./ \( -type f -name \*.so -print , -type f -name \*.cmake -print , -type f -name CMakeCache.txt -print , -type f -name Makefile -print \) | grep -v "./cmake" | xargs -i rm {} -f
-find ./ \( -type f -name install_manifest.txt -print , -type f -name cmake_install.cmake -print \) | xargs -i rm {} -f
-
-# remove precompiled in files
-find ./ -name \*.in -print | while read r; do rm -f ${r/\.in/}; done
-
-# remove compiled binaries
-find src -name tuxanci -print | xargs -i rm {} -f
-find src -name tuxanci-server -print | xargs -i rm {} -f
-
-# remove compiled gettext files
-find ./ -name \*.gmo -print | xargs -i rm {} -f
-
-# remove temporary backup files
-find ./ -type f -name \*~ -print | xargs -i rm {} -f
-
-# remove so libraries
-find ./src/modules -type f -name mod\*.so\* | xargs -i rm {} -f
diff --git a/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
index cd4c9d8..cd4c9d8 100644
--- a/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in
diff --git a/scripts/clean.sh b/scripts/clean.sh
new file mode 100755
index 0000000..6304b57
--- /dev/null
+++ b/scripts/clean.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+ 
+# remove compiled files
+[ -e "[Mm]akefile" ] && make clean
+
+# remove folders
+find ../ -type d -name CMakeFiles -print | xargs -i rm {} -rf
+# some people build Tuxanci in speacial folder
+rm -rf ../build
+
+# remove cmake files
+find ../ \( -type f -name \*.so -print , -type f -name \*.cmake -print , -type f -name CMakeCache.txt -print , -type f -name Makefile -print \) | grep -v "./cmake" | xargs -i rm {} -f
+find ../ \( -type f -name install_manifest.txt -print , -type f -name cmake_install.cmake -print \) | xargs -i rm {} -f
+
+# remove precompiled in files
+find ../ -name \*.in -print | while read r; do rm -f ${r/\.in/}; done
+
+# remove compiled binaries
+find ../src -name tuxanci -print | xargs -i rm {} -f
+find ../src -name tuxanci-server -print | xargs -i rm {} -f
+
+# remove compiled gettext files
+find ../ -name \*.gmo -print | xargs -i rm {} -f
+
+# remove temporary backup files
+find ../ -type f -name \*~ -print | xargs -i rm {} -f
+
+# remove so libraries
+find ../src/modules -type f -name mod\*.so\* | xargs -i rm {} -f
diff --git a/generate_gettext_pot.sh b/scripts/generate_gettext_pot.sh
index 60d750c..8a0ffb8 100755
--- a/generate_gettext_pot.sh
+++ b/scripts/generate_gettext_pot.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+pushd ../ > /dev/null
 xgettext --default-domain=tuxanci --add-comments=/// -k_ `find ./ -name \*.c | grep -v .git | tr '\n' ' '` -o ./po/tuxanci.pot
 cd po/
 find ./ -name \*.po -print | xargs -i msgmerge -U {} tuxanci.pot
+popd > /dev/null
diff --git a/kr.sh b/scripts/kr.sh
index dbc1842..dbc1842 100755
--- a/kr.sh
+++ b/scripts/kr.sh