Commit 6b3264a9 authored Apr 28, 2017 by John Bonn

merge of r7483 through r7620 into IPCE branch

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce_FY17-Sprint1@7621 41f8697f-d340-4b68-9986-7bafba869bb8

parent 23d624f0

isis/make/config.darwin-MacOSX10_10

+0 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary
		# Set up paths to tools needed for doxygen
		DOXYGEN = $(ISIS3OPT)/bin/doxygen
		DOT_PATH = $(ISIS3OPT)/bin
		LATEX = $(ISIS3OPT)/bin/latex

		#---------------------------------------------------------------------------
		# Set up for cwd

isis/make/config.darwin-MacOSX10_11

+0 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,6 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary
		# Set up paths to needed for doxygen
		DOXYGEN = $(ISIS3OPT)/bin/doxygen
		DOT_PATH = $(ISIS3OPT)/bin
		LATEX = $(ISIS3OPT)/bin/latex
		GREP = $(ISIS3OPT)/bin/grep

		#---------------------------------------------------------------------------

isis/make/config.darwin-MacOSX10_6

+0 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary
		# Set up paths to needed for doxygen
		DOXYGEN = $(ISIS3OPT)/bin/doxygen
		DOT_PATH = $(ISIS3OPT)/bin
		LATEX = $(ISIS3OPT)/bin/latex

		#---------------------------------------------------------------------------
		# Set up for cwd

isis/make/config.darwin-MacOSX10_8

+0 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary
		# Set up paths to needed for doxygen
		DOXYGEN = $(ISIS3OPT)/bin/doxygen
		DOT_PATH = $(ISIS3OPT)/bin
		LATEX = $(ISIS3OPT)/bin/latex

		#---------------------------------------------------------------------------
		# Set up for cwd

isis/make/isismake.init

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ ECHO := /bin/echo
		EVAL := eval
		GREP := grep
		HEAD := head
		LATEX := latex
		LN := ln -s
		LS := /bin/ls
		MKDIR := mkdir -p