Index: developer_scripts/cgal_manual
===================================================================
--- developer_scripts/cgal_manual	(revision 29032)
+++ developer_scripts/cgal_manual	(working copy)
@@ -1908,12 +1908,15 @@
   cmdlog -noexec 'export TEXINPUTS=".:../examples:../demo:${TEXINPUTS}"'
   cmdlog -noexec 'export LATEX_CONV_INPUTS=".:../examples:../demo:${LATEX_CONV_INPUTS}"'
   # case 3: all others, need to be checked if it is already in searchpath
-  if [ "`find_in_search_path Manual/cgal_manual.sty ${TEXINPUTS}`" == "" ]; then
-      echo "${ErrorColor}ERROR${ResetColor}: Could not find Manual/cgal_manual.sty in "'$TEXINPUTS'" search path." 1>&2
+  if [  "`kpsewhich Manual/cgal_manual.sty`" == "" -a "`find_in_search_path Manual/cgal_manual.sty ${TEXINPUTS}`" == "" ]; then
+	  echo "${ErrorColor}ERROR${ResetColor}: Could not find Manual/cgal_manual.sty in "'$TEXINPUTS'" search path." 1>&2
   fi
-  if [ "`find_in_search_path Manual/cgal_manual.sty ${LATEX_CONV_INPUTS}`" == "" ]; then
+  TEMP_TEXINPUTS=$TEXINPUTS
+  TEXINPUTS=$LATEX_CONV_INPUTS
+  if [ "`kpsewhich Manual/cgal_manual.sty`" == "" -a "`find_in_search_path Manual/cgal_manual.sty ${LATEX_CONV_INPUTS}`" == "" ]; then
       echo "${ErrorColor}ERROR${ResetColor}: Could not find Manual/cgal_manual.sty in "'$LATEX_CONV_INPUTS'" search path." 1>&2
   fi
+  TEXINPUTS=$TEMP_TEXINPUTS
 fi
 
 # Prepare BIBINPUTS
@@ -1925,7 +1928,7 @@
   cmdlog -noexec 'export BIBINPUTS="../../Manual/doc_tex:${BIBINPUTS}"'
 else
   # case 3: all others, need to be checked if it is already in searchpath
-  if [ "`find_in_search_path Manual/cgal_manual.bib ${BIBINPUTS}`" == "" ]; then
+  if [ "`kpsewhich Manual/cgal_manual.bib`" == "" -a "`find_in_search_path Manual/cgal_manual.bib ${BIBINPUTS}`" == "" ]; then
       echo "${ErrorColor}ERROR${ResetColor}: Could not find Manual/cgal_manual.bib in "'$BIBINPUTS'" search path." 1>&2
   fi
 fi