use /usr/bin/find and uname for cygwin version

2 files changed, 6 insertions, 6 deletions

diff --git a/Utilities/cmake-cygwin-package.sh b/Utilities/cmake-cygwin-package.sh
index 80b7660..23ff392 100755
--- a/Utilities/cmake-cygwin-package.sh
+++ b/Utilities/cmake-cygwin-package.sh
@@ -65,7 +65,7 @@ install()
      ${INSTALL_DIR}${PREFIX}/doc/Cygwin/${FULLPKG}.README &&
   touch ${INSTALL_DIR}${PREFIX}/doc/${PKG}-${VER}/MANIFEST &&
   cd ${INSTALL_DIR} &&
-  FILES=`find .${PREFIX} -type f |sed 's/^\.\//\//'` &&
+  FILES=`/usr/bin/find .${PREFIX} -type f |sed 's/^\.\//\//'` &&
 (
 cat >> ${INSTALL_DIR}${PREFIX}/doc/${PKG}-${VER}/MANIFEST <<EOF
 ${FILES}
@@ -78,8 +78,8 @@ strip()
 {
   (
   cd ${INSTALL_DIR} &&
-  find . -name "*.dll" | xargs strip >/dev/null 2>&1
-  find . -name "*.exe" | xargs strip >/dev/null 2>&1
+  /usr/bin/find . -name "*.dll" | xargs strip >/dev/null 2>&1
+  /usr/bin/find . -name "*.exe" | xargs strip >/dev/null 2>&1
   true
   )
 }
diff --git a/Utilities/cmake_release_cygwin.sh b/Utilities/cmake_release_cygwin.sh
index d8a66ea..d9b1660 100755
--- a/Utilities/cmake_release_cygwin.sh
+++ b/Utilities/cmake_release_cygwin.sh
@@ -16,14 +16,15 @@ SELF_DIR=`cd \`echo "$0" | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd`
 
 WriteREADME()
 {
+CYGVERSION=`uname -r`
 cat > ${PKG}-${VER}/CYGWIN-PATCHES/cmake.README <<EOF
 cmake
 --------------------------------------
 Runtime requirements:
-  cygwin-1.3.5 or newer
+  cygwin-${CYGVERSION} or newer
 
 Build requirements
-  cygwin-1.3.5 or newer
+  cygwin-${CYGVERSION} or newer
   make
 
 Canonical homepage:
@@ -84,7 +85,6 @@ SourcePatch()
   mkdir -p ${PKG}-${VER}/CYGWIN-PATCHES &&
   WriteREADME &&
   WriteSetupHint &&
-  cp ${PKG}-${VER}/Utilities/setup.hint ${PKG}-${VER}/CYGWIN-PATCHES &&
   (diff -urN "${PKG}-${VER}-orig" "${PKG}-${VER}" > "${FULLPKG}.patch")
   rm -rf ${PKG}-${VER} ${PKG}-${VER}-orig
 }