Commit e11acfdb authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Merged trunk into the ipce branch. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7947 41f8697f-d340-4b68-9986-7bafba869bb8
parent 12b10239

isis/3rdParty/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include $(ISISROOT)/make/isismake.os 


all:  install



install: libs plugins

install: libs license plugins



#libs: license

libs:
@@ -69,7 +69,7 @@ libs: 


license:

	echo $(CURTIMESTAMP) "  Obtaining licenses";                         \

	$(RSYNC) -a /usgs/pkgs/local/$(ISISLOCALVERSION)/license/            \

	$(RSYNC) -a $(THIRDPARTYLICPATH)														         \

	  $(ISISROOT)/3rdParty/license/



plugins:

isis/IsisPreferences

+2 −1
Original line number Diff line number Diff line
@@ -163,9 +163,9 @@ Group = DataDirectory 
  Clementine1  = $ISIS3DATA/clementine1

  Control      = $ISIS3DATA/control

  Dawn         = $ISIS3DATA/dawn

  Tgo          = $ISIS3DATA/tgo

  Galileo      = $ISIS3DATA/galileo

  Hayabusa     = $ISIS3DATA/hayabusa

  Hayabusa2    = $ISIS3DATA/hayabusa2

  Juno         = $ISIS3DATA/juno

  Kaguya       = $ISIS3DATA/kaguya

  Lo           = $ISIS3DATA/lo
@@ -183,6 +183,7 @@ Group = DataDirectory 
  Rolo         = $ISIS3DATA/rolo

  Rosetta      = $ISIS3DATA/rosetta

  Smart1       = $ISIS3DATA/smart1

  Tgo          = $ISIS3DATA/tgo

  Viking1      = $ISIS3DATA/viking1

  Viking2      = $ISIS3DATA/viking2

  Voyager1     = $ISIS3DATA/voyager1

isis/make/config.darwin-10.5

+13 −14
Original line number Diff line number Diff line
@@ -309,4 +309,3 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libicudata*.dylib" 


#  Plugins

THIRDPARTYPLUGINS +=  "$(ISIS3OPT)/libexec/qt4-mac/plugins/"

isis/make/config.darwin-MacOSX10_10

+16 −17
Original line number Diff line number Diff line
@@ -368,4 +368,3 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libproj*.dylib" 


#  Plugins

THIRDPARTYPLUGINS +=  "$(ISIS3OPT)/share/qt4/plugins/"

isis/make/config.darwin-MacOSX10_11

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ DOXYGEN = $(ISIS3OPT)/bin/doxygen 
DOT_PATH    = $(ISIS3OPT)/bin

GREP        = $(ISIS3OPT)/bin/grep



# Set up path for OS specific locations of 3rd party licenses

THIRDPARTYLICPATH := /opt/usgs/$(ISISLOCALVERSION)/3rdParty/license/



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

# Set up for cwd

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