doxygen-1.8.1-prefix-misc-alt.patch 2.07 KB
* make sure we always look for tools in the path, no "do it yourself paths"

--- a/configure
+++ b/configure
@@ -170,27 +170,15 @@
       ;;
     Darwin:*)
       f_platform=macosx-c++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
       ;;
     FreeBSD:*)
       f_platform=freebsd-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
       ;;
     NetBSD:*)
       f_platform=netbsd-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
       ;;
     HP-UX:*)
       f_platform=hpux-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
       ;;
     IRIX64:*)
       f_platform=irix-64
@@ -221,9 +209,6 @@
       ;;
     SunOS:5*)
       f_platform=solaris-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
       ;;
     ULTRIX:*)
       f_platform=ultrix-g++
@@ -323,8 +308,8 @@
 
 echo -n "  Checking for GNU install tool... "
 if test "$f_insttool" = NO; then
-  install_names="ginstall install"
-  install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
+  install_names="install"
+  install_dirs="$bin_dirs"
   install_prog=NO
   install_found=NO
   for i in $install_names; do
@@ -360,7 +345,7 @@
 
 echo -n "  Checking for dot (part of GraphViz)... "
 if test "$f_dot" = NO; then
-  dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
+  dot_dirs="$bin_dirs"
   dot_prog=NO
   for j in $dot_dirs; do
     if test -x "$j/dot"; then
@@ -382,7 +367,7 @@
 echo -n "  Checking for perl... "
 if test "$f_perl" = NO; then
   perl_names="perl perl5"
-  perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
+  perl_dirs="$bin_dirs"
   perl_prog=NO
   perl_found=NO
   for i in $perl_names; do
@@ -546,10 +531,6 @@
   cat >> .tmakeconfig <<EOF
     TMAKE_LFLAGS += -non_shared
 EOF
-  elif test "$f_platform" = "solaris-cc"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -Bstatic
-EOF
   elif test "$f_platform" = "hpux-cc"; then
   cat >> .tmakeconfig <<EOF
     TMAKE_LFLAGS += -noshared