ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/make_basic.mk
(Generate patch)

Comparing make_basic.mk (file contents):
Revision 1.68 by arta, Wed Jan 12 02:04:59 2011 UTC vs.
Revision 1.69 by arta, Wed Feb 2 19:49:16 2011 UTC

# Line 35 | Line 35 | endif
35   # This optional file has custom definitions created by the configure script.
36   # Do this after compiler selection since custom.mk might use $COMPILER or $FCOMPILER.
37   # custom.mk might also set compiler (through moreconfigure.pl)
38 < -include $(LOCALIZATIONDIR)/custom.mk
38 > -include $(SRCDIR)/$(LOCALIZATIONDIR)/custom.mk
39   #***********************************************************************************************#
40  
41   #***********************************************************************************************#
# Line 331 | Line 331 | FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
331   # PROJECT MAKE RULES
332   #
333   # Make rules that apply to all projects outside of the base DRMS/SUMS system
334 < -include $(SRCDIR)/proj/make_basic.mk
334 > -include $(SRCDIR)/$(LOCALIZATIONDIR)/make_basic.mk
335   #***********************************************************************************************#
336  
337  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines