[cmake-commits] alex committed CPack.STGZ_Header.sh.in 1.5 1.6 FindPHP4.cmake 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv1603

Modified Files:
	CPack.STGZ_Header.sh.in FindPHP4.cmake 
Log Message:

BUG: fix #5329, if /usr/xpg4/bin/tail exists, use this one -> on SunOS
/usr/bin/tail doesn't understand the -n +<number> syntax
-remove standard searchd dirs from FindPHP4.cmake

Alex


Index: FindPHP4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPHP4.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FindPHP4.cmake	15 Dec 2005 19:17:42 -0000	1.5
+++ FindPHP4.cmake	19 Jul 2007 13:42:57 -0000	1.6
@@ -30,12 +30,7 @@
   SET(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths")
 ENDIF(PHP4_FOUND_INCLUDE_PATH)
 
-FIND_PROGRAM(PHP4_EXECUTABLE
-  NAMES php4 php
-  PATHS
-  /usr/bin
-  /usr/local/bin
-  )
+FIND_PROGRAM(PHP4_EXECUTABLE NAMES php4 php )
 
 MARK_AS_ADVANCED(
   PHP4_EXECUTABLE

Index: CPack.STGZ_Header.sh.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.STGZ_Header.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CPack.STGZ_Header.sh.in	6 Mar 2007 14:16:46 -0000	1.5
+++ CPack.STGZ_Header.sh.in	19 Jul 2007 13:42:57 -0000	1.6
@@ -123,7 +123,15 @@
 # take the archive portion of this file and pipe it to tar
 # the NUMERIC parameter in this command should be one more
 # than the number of lines in this header file
-tail -n +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
+# on SunOS there are two tails, the one in /usr/bin doesn't understand
+# the -n +<number> syntax, the one in /usr/xpg4/bin/ does
+tail_executable=tail
+if [ -x /usr/xpg4/bin/tail ]
+then
+  tail_executable=/usr/xpg4/bin/tail
+fi
+
+"$tail_executable" -n +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
 
 echo "Unpacking finished successfully"