kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Alexander Neundorf 2007-07-19 09:42:57 -04:00
parent c7770b8edb
commit ad8efca061
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/CPack.STGZ_Header.sh.in
View File

@ -123,7 +123,15 @@ echo ""
# take the archive portion of this file and pipe it to tar # take the archive portion of this file and pipe it to tar
# the NUMERIC parameter in this command should be one more # the NUMERIC parameter in this command should be one more
# than the number of lines in this header file # 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" echo "Unpacking finished successfully"

7
Modules/FindPHP4.cmake
View File

@ -30,12 +30,7 @@ IF(PHP4_FOUND_INCLUDE_PATH)
SET(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths") SET(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths")
ENDIF(PHP4_FOUND_INCLUDE_PATH) ENDIF(PHP4_FOUND_INCLUDE_PATH)
FIND_PROGRAM(PHP4_EXECUTABLE FIND_PROGRAM(PHP4_EXECUTABLE NAMES php4 php )
NAMES php4 php
PATHS
/usr/bin
/usr/local/bin
)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
PHP4_EXECUTABLE PHP4_EXECUTABLE