diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-07-05 16:03:57 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-07-05 16:03:57 (GMT) |
| commit | 863ca7d0e205fb89f57fcdb63423e7ff17631e40 (patch) | |
| tree | b5c342bf9569797ffd0be8884c7380a14ffbbe75 | |
| parent | 3524dc421fe272f6154919bdd0c3243265a0e421 (diff) | |
| download | CMake-863ca7d0e205fb89f57fcdb63423e7ff17631e40.zip CMake-863ca7d0e205fb89f57fcdb63423e7ff17631e40.tar.gz CMake-863ca7d0e205fb89f57fcdb63423e7ff17631e40.tar.bz2 | |
BUG: fix solaris problems in install and ar
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 4 | ||||
| -rwxr-xr-x | Templates/configure | 2 | ||||
| -rw-r--r-- | Templates/configure.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 3bcd3ba..4362d2a 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -1042,7 +1042,7 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout) for (i = sf.begin(); i != sf.end(); ++i) { fout << "\t@ echo \"Installing " << *i << " \"\n"; - fout << "\t@if [ -e " << *i << " ] ; then \\\n"; + fout << "\t@if [ -f " << *i << " ] ; then \\\n"; // avoid using install-sh to install install-sh // does not work on windows.... if(*i == "install-sh") @@ -1055,7 +1055,7 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout) } fout << *i << " " << prefix << l->second.GetInstallPath() << "; \\\n"; - fout << "\t elif [ -e ${srcdir}/" << *i << " ] ; then \\\n"; + fout << "\t elif [ -f ${srcdir}/" << *i << " ] ; then \\\n"; // avoid using install-sh to install install-sh // does not work on windows.... if(*i == "install-sh") diff --git a/Templates/configure b/Templates/configure index e90fc78..d54fd16 100755 --- a/Templates/configure +++ b/Templates/configure @@ -3054,7 +3054,7 @@ case $system in : else echo "Using $CXX -xar -o for creating .a libraries" - CMAKE_AR="$CXX -xar -o" + CMAKE_AR="$CXX" CMAKE_AR_ARGS="-xar -o" fi esac diff --git a/Templates/configure.in b/Templates/configure.in index 5699375..ae8a074 100644 --- a/Templates/configure.in +++ b/Templates/configure.in @@ -551,7 +551,7 @@ case $system in : else echo "Using $CXX -xar -o for creating .a libraries" - CMAKE_AR="$CXX -xar -o" + CMAKE_AR="$CXX" CMAKE_AR_ARGS="-xar -o" fi esac |