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

Comparing configsdp.txt (file contents):
Revision 1.2 by arta, Fri Feb 4 01:33:56 2011 UTC vs.
Revision 1.59 by arta, Tue Jul 26 20:39:57 2016 UTC

# Line 1 | Line 1
1   # This file contains JSOC_SDP-specific configuration information. It is used only if the '-sdp' flag is used
2 < # as an argument to the check-out script (checkoutDRMS.pl).
2 > # as an argument to the check-out script (checkoutDRMS.pl). To change the configuration at Stanford, edit
3 > # this file directly, and commit those changes to the source-tree repository.
4  
5 < # The lines in the __MAKE__ section define JSOC_SDP-specific make variables, targets, and rules. When
6 < # configproj.pl is run, it will process this section and create JSOC/localization/make_basic.mk. These are
5 > # The lines in the __PROJ_MK_RULES__ section define JSOC_SDP-specific make variables, targets, and rules. When
6 > # localize.py is run, it will process this section and create JSOC/localization/make_basic.mk. These are
7   # available to all JSOC_SDP projects.
8  
9 < # The lines in the __PROJ__ section define JSOC_SDP projects. When configproj.pl runs, file content will be
9 > # The lines in the __PROJ__ section define JSOC_SDP projects. When localize.py runs, file content will be
10   # added to JSOC/localization/Rules.mk and JSOC/localization/target.mk.
11  
12 < # The lines in the __LIBS__ section define default JSOC_SDP-specific third-party library configuration information.
13 < # These values apply to all code in both JSOC/base and JSOC/proj directories. Entries in config.local will override
14 < # these values. This section is read by moreconfigure.pl only - configproj.pl does not look at this section.
12 > # The lines in the __PROJCFG__ section define additional project-specific configuration. The code in this
13 > # section must be in a shell-scripting language, and will be executed as is.
14 >
15 > # The lines in the __MAKE__ section define global make variables to configure the make process. A subset of
16 > # these variables defines the locations of JSOC_SDP-specific third-party libraries. These values apply to all code
17 > # in both JSOC/base and JSOC/proj directories.
18 >
19 > __DEFS__
20 > q:SERVER                        hmidb
21 > q:DRMSPGPORT                    5432
22 > q:SUMS_DB_HOST                  hmidb3
23 > q:SUMPGPORT                     5434
24 > a:SUMSD_MAX_THREADS             32
25 > a:SUMSD_LISTENPORT              6004
26 > a:DRMS_LOCAL_SITE_CODE          0x0000
27 > q:DBNAME                        jsoc
28 > q:WEB_DBUSER                    apache
29 > q:POSTGRES_ADMIN                postgres
30 > q:SUMS_MANAGER                  production
31 > q:SUMS_GROUP                    SOI
32 > q:SUMLOG_BASEDIR                /usr/local/logs/SUM
33 > q:SUMBIN_BASEDIR                /usr/local/bin
34 > q:SUMSERVER                     k1.stanford.edu
35 > # The number of SUMS process SETS to spawn. If this number is not 1, then the number of SUMS processes
36 > # is SUM_NUMSUM * 5 + 2.
37 > a:SUM_NUMSUM                    3
38 > a:SUM_MAXNUMSUM                 8
39 > p:SUMS_TAPE_AVAILABLE           1
40 > p:SUMS_MULTIPLE_PARTNSETS       1
41 > # No idea what this parameter means. It isn't used anywhere in our code, but for some reason
42 > # it is part of the config.local set, so we have to include it here.
43 > a:SUMS_DEBUG                    1
44 > q:PRODUSER_DBHOST               hmidb:5432
45 > q:PRODUSER_DBNAME               jsoc
46 > q:PRODUSER_PRODTAB              su_production.produsers
47 > q:PRODUSER_COLUSER              username
48 > q:SUMRM_PART_PERCENT_FREE       3
49 > q:SUMRM_SLEEP                   300
50 > # This is a file in SUMLOG_BASEDIR.
51 > q:SUMRM_LOG                     sum_rm.cfg
52 > q:SUMRM_MAIL                    sys2@solar2
53 > q:SUMRM_NOOP                        0
54 > q:SUMRM_USER                        production
55 > q:SUMRM_NORUN_START                 0
56 > q:SUMRM_NORUN_STOP              0
57 > # JMD
58 > p:JMD_IS_INSTALLED              0
59 > q:JMD_URL                       http://localhost:8080/JMD/JMD
60 > # Remote SUMS
61 > q:RS_SITE_TABLE                         drms.rs_sites
62 > q:RS_REQUEST_TABLE                      drms.rs_requests
63 > q:RS_SU_TABLE                           drms.rs_sus
64 > q:RS_DBNAME                             jsoc
65 > q:RS_DBHOST                             hmidb
66 > a:RS_DBPORT                             5432
67 > q:RS_DBUSER                             production
68 > q:RS_LOCKFILE                           /home/jsoc/locks/remotesums.lck
69 > q:RS_LOGDIR                             /home/jsoc/jsoclogs/rsums
70 > a:RS_DLTIMEOUT                          30
71 > a:RS_REQTIMEOUT                          5
72 > a:RS_MAXTHREADS                         32
73 > q:RS_BINPATH                            /home/jsoc/cvs/Development/JSOC/bin/linux_x86_64
74 > q:RS_N_WORKERS                          4
75 > # White-list (access to internal stuff)
76 > a:WL_HASWL                              1
77 > q:WL_FILE                               /web/jsoc/htdocs/whitelist.txt
78 > # Bin paths
79 > q:BIN_EXPORT                            /home/jsoc/cvs/Development/JSOC/bin
80 > q:SCRIPTS_EXPORT                        /home/jsoc/cvs/Development/JSOC/scripts
81 > q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython27
82 > a:SUMS_USEMTSUMS                        1
83 > # Email registration
84 > a:REGEMAIL_TIMEOUT                      5
85 > # Slony
86 > q:SLONY_CONFIG                          /home/jsoc/cvs/Development/JSOC/proj/replication/etc/repserver.cfg
87 >
88 > # lev1.5_hmi
89 > q:POLCAL_PARAMS                         /home/jsoc/hmi/tables/lev15/polcal-param-fit.bin
90  
91   __MAKE__
92 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
93 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
92 > # JSOC_SDP third-party libraries used by base
93 > # The parameters in this section are used to create make variables. For example, the line
94 > # 'POSTGRES_LIB = pq' will cause a make variable named POSTGRES_LIB to be created and to
95 > # be assigned the value 'pq'.
96 >
97 > # If the name in the left column contains a colon, then the name on the LHS is the parameter name. The RHS is
98 > # a description of which platforms or specific machines the parameter applies to. For example,
99 > # the name POSTGRES_INCS:X86_64 implies that the value of the parameter named POSTGRES_INCS is /usr/include
100 > # when make is run on a linux_x86_64 machine. The RHS string can contain either a platform identifier
101 > # (X86_64, IA32, AVX, or IA64) or it can be a string that identifies a particular machine, like d02.
102 > # If the string is not one of the defined platform identifiers, then it is considered a machine identifier.
103 > # A machine identifier can specify more than one machine. The name POSTGRES_INCS:hmidb specifies
104 > # all machines whose names contain the string 'hmidb'. So, for machines hmidb, hmidb2, and hmidb3, the
105 > # value of the POSTGRES_INCS parameter is /usr/local/pgsql/include.
106 > #
107 > # If the RHS is a platform identifier, then make compares the value of $JSOC_MACHINE (which is in
108 > # reality a misnomer, since it truly specifies the name of the machine platform, not the name
109 > # of the machine) to the platform name specified by the RHS string. For example,
110 > # if the RHS string is 'avx', then make compares $JSOC_MACHINE to
111 > # 'linux_avx', and if there is a match, then the parameter's value specified in the second column is assigned
112 > # to the make variable. If the RHS is a machine identifier, then make compares the value of $MACHTYPE
113 > # (another misnormer, since it is the name of the machine, not the name of some type of machine ) to
114 > # the machine names specified by the RHS. For example, if the RHS string is 'hmidb' then make
115 > # compares $MACHTYPE to 'hmidb', and if 'hmidb' is a substring of $MACHTYPE, then the parameter's
116 > # value specified in the second column is assigned to the make variable
117 > #
118 > # Blocks defined by the _CUST_/_ENDCUST_ tags are copied ver batim into the output make file.
119 >
120 > POSTGRES_LIB            pq
121 > CFITSIO_LIB             cfitsio
122 >
123 > POSTGRES_INCS:X86_64    /usr/include
124 > POSTGRES_INCS:IA32      /usr/include
125 > POSTGRES_INCS:AVX       /usr/include
126 > POSTGRES_INCS:IA64      /usr/include/pgsql
127 > POSTGRES_INCS:j1       /usr/include/pgsql
128 > POSTGRES_INCS:d02      /usr/include/pgsql
129 > POSTGRES_INCS:hmidb    /usr/local/pgsql/include
130 > POSTGRES_INCS:cl1n0    __POSTGRES_DEVELOP_NOT_INSTALLED__
131 > POSTGRES_INCS:dcs      /usr/include/pgsql
132 >
133 > POSTGRES_LIBS:X86_64    /usr/lib64
134 > POSTGRES_LIBS:IA32      /usr/lib
135 > POSTGRES_LIBS:AVX       /usr/lib64
136 > POSTGRES_LIBS:IA64      /usr/lib
137 > POSTGRES_LIBS:j1       /usr/lib64
138 > POSTGRES_LIBS:d02      /usr/lib
139 > POSTGRES_LIBS:hmidb    /usr/lib64
140 > POSTGRES_LIBS:cl1n0    /usr/lib64
141 > POSTGRES_LIBS:dcs      /usr/lib64
142 >
143 > CFITSIO_INCS:X86_64     /home/jsoc/include
144 > CFITSIO_INCS:IA32       /home/jsoc/include
145 > CFITSIO_INCS:AVX        /home/jsoc/avx/include
146 > CFITSIO_INCS:IA64       /home/jsoc/include
147 > CFITSIO_INCS:j1         /home/jsoc/include
148 > CFITSIO_INCS:d02        __CFITSIO_NOT_INSTALLED__
149 > CFITSIO_INCS:hmidb      /home/jsoc/include
150 > CFITSIO_INCS:cl1n0      /home/jsoc/include
151 > CFITSIO_INCS:dcs        /home/jsoc/include
152 >
153 > CFITSIO_LIBS:X86_64     /home/jsoc/lib/linux-x86_64
154 > CFITSIO_LIBS:IA32       /home/jsoc/lib/linux-ia32
155 > CFITSIO_LIBS:AVX        /home/jsoc/avx/lib
156 > CFITSIO_LIBS:IA64       /home/jsoc/lib/linux-ia64
157 > CFITSIO_LIBS:j1         /home/jsoc/lib/linux-x86_64
158 > CFITSIO_LIBS:d02        __CFITSIO_NOT_INSTALLED__
159 > CFITSIO_LIBS:hmidb      /home/jsoc/lib/linux-x86_64
160 > CFITSIO_LIBS:cl1n0      /home/jsoc/lib/linux-x86_64
161 > CFITSIO_LIBS:dcs        /home/jsoc/lib/linux-x86_64
162 >
163 > FFTW_INCS:X86_64        /home/jsoc/include
164 > FFTW_INCS:IA32          /home/jsoc/include
165 > FFTW_INCS:AVX           /home/jsoc/avx/include
166 > FFTW_INCS:IA64          /home/jsoc/include
167 >
168 > FFTW_LIBS:X86_64        /home/jsoc/lib/linux-x86_64
169 > FFTW_LIBS:IA32          /home/jsoc/lib/linux-ia32
170 > FFTW_LIBS:AVX           /home/jsoc/avx/lib
171 > FFTW_LIBS:IA64          /home/jsoc/lib/linux-x86_64
172 >
173 > GSL_INCS:X86_64         /home/jsoc/include
174 > GSL_INCS:IA32           /home/jsoc/include
175 > GSL_INCS:AVX            /home/jsoc/avx/include
176 > GSL_INCS:IA64           /home/jsoc/include
177 >
178 > GSL_LIBS:X86_64         /home/jsoc/lib/linux-x86_64
179 > GSL_LIBS:IA32           /home/jsoc/lib/linux-ia32
180 > GSL_LIBS:AVX            /home/jsoc/avx/lib
181 > GSL_LIBS:IA64           /home/jsoc/lib/linux-x86_64
182 >
183 > MPI_INCS:X86_64         /home/jsoc/mpich2/include
184 > MPI_INCS:IA32          
185 > MPI_INCS:AVX            /home/jsoc/avx/include
186 > MPI_INCS:IA64          
187 >
188 > MPI_LIBS:X86_64         /home/jsoc/mpich2/lib
189 > MPI_LIBS:AVX            /home/jsoc/avx/lib
190 >
191 > MPI_PATH:X86_64         /home/jsoc/mpich2/bin
192 > MPI_PATH:AVX            /home/jsoc/avx/bin
193 >
194 > TAR_INCS:X86_64         /home/jsoc/include
195 > TAR_INCS:IA32           /home/jsoc/include
196 > TAR_INCS:AVX            /home/jsoc/avx/include
197 > TAR_INCS:IA64           /home/jsoc/include
198 >
199 > TAR_LIBS:X86_64         /home/jsoc/lib/linux-x86_64
200 > TAR_LIBS:IA32           /home/jsoc/lib/linux-ia32
201 > TAR_LIBS:AVX            /home/jsoc/lib/linux_avx
202 > TAR_LIBS:IA64           /home/jsoc/lib/linux-ia64
203 >
204 > # Set custom make file to tell the make system that the gcc cfitsio library is called
205 > # libcfitsio_gcc.a
206 > _CUST_
207 > ifeq ($(COMPILER), gcc)
208 >    ifeq ($(JSOC_MACHINE), linux_x86_64)
209 >    CFITSIO_LIB = cfitsio_gcc
210 >    endif
211 > endif
212 > _ENDCUST_
213 >
214 > __PROJ_MK_RULES__
215 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
216 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
217  
218   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
219   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
21 __END__
220   __PROJ__
221   <?xml version='1.0'?>
222   <projects>
# Line 30 | Line 228 | __PROJ__
228               <subdir>dsputil</subdir>
229               <subdir>gapfiller</subdir>
230               <subdir>interpolate</subdir>
33             <subdir>json</subdir>
231               <subdir>stats</subdir>
232 +             <subdir>egsehmicomp</subdir>
233 +             <subdir>imrotate</subdir>
234 +             <subdir>projection</subdir>
235         </subdirs>
236     </proj>
237     <proj>
# Line 60 | Line 260 | __PROJ__
260          </filters>
261     </proj>
262     <proj>
263 +        <name>mhd_32daily</name>
264 +        <subdirs>
265 +                <subdir>apps</subdir>
266 +        </subdirs>
267 +   </proj>
268 +   <proj>
269 +        <name>mhd_64cr</name>
270 +        <subdirs>
271 +                <subdir>apps</subdir>
272 +        </subdirs>
273 +   </proj>
274 +   <proj>
275          <name>util</name>
276          <subdirs>
277               <subdir>apps</subdir>    
# Line 105 | Line 317 | __PROJ__
317     <proj>
318          <name>globalhs</name>
319          <subdirs>
320 <            <subdir>apps/src</subdir>
320 >            <subdir>apps</subdir>
321 >            <subdir>libs/dtgf</subdir>
322 >            <subdir>libs/inv2d</subdir>
323 >            <subdir>libs/pkbgn</subdir>
324 >            <subdir>libs/projection</subdir>
325          </subdirs>
326          <filters>
327               <filter>
# Line 122 | Line 338 | __PROJ__
338          </subdirs>
339     </proj>
340     <proj>
341 +        <name>lev1.5_aia</name>
342 +        <subdirs>
343 +            <subdir>apps</subdir>
344 +        </subdirs>
345 +   </proj>
346 +   <proj>
347          <name>flatfield</name>
348          <subdirs>
349              <subdir>libs/flatfieldlib</subdir>
350              <subdir>apps</subdir>
351 +            <subdir>off_flat_IDL</subdir>
352 +        </subdirs>
353 +   </proj>
354 +  <proj>
355 +        <name>rings</name>
356 +        <subdirs>
357 +             <subdir>apps</subdir>
358 +        </subdirs>
359 +   </proj>
360 +  <proj>
361 +        <name>sharp</name>
362 +        <subdirs>
363 +             <subdir>apps</subdir>
364          </subdirs>
365          <filters>
366               <filter>
367 <                  <name>JSOC_MACHINE</name>
368 <                  <value>linux_x86_64</value>
367 >                  <name>COMPILER</name>
368 >                  <value>icc</value>
369               </filter>
370         </filters>
371     </proj>
372    <proj>
373 <        <name>rings</name>
373 >        <name>farside</name>
374 >        <subdirs>
375 >             <subdir>apps</subdir>
376 >        </subdirs>
377 >   </proj>
378 >  <proj>
379 >        <name>timed</name>
380          <subdirs>
381               <subdir>apps</subdir>
382          </subdirs>
# Line 143 | Line 384 | __PROJ__
384     <proj>
385          <name>mag</name>
386          <subdirs>
146             <subdir>apps</subdir>
387               <subdir>pfss/apps</subdir>
388               <subdir>ambig/apps</subdir>
389 +             <subdir>harp/apps</subdir>
390 +             <subdir>harp/libs/matlab/mex/src/util</subdir>
391 +             <subdir>harp/libs/matlab/mex/src/mex2c</subdir>
392 +             <subdir>harp/libs/matlab/mfile-mex/standalone</subdir>
393 +             <subdir>harp/libs/matlab/mfile-mex/assignment</subdir>
394 +             <subdir>harp/libs/matlab/mfile-mex/fits</subdir>
395 +             <subdir>harp/libs/matlab/mfile-mex/hmi-mask-patch</subdir>
396               <subdir>ident/apps</subdir>
397               <subdir>ident/libs/mex2c</subdir>
398               <subdir>ident/libs/mexfunctions</subdir>
399               <subdir>ident/libs/util</subdir>
400 +             <subdir>libs</subdir>
401 +             <subdir>libs/util</subdir>
402               <subdir>patch/apps</subdir>
403 +             <subdir>nlfff/apps</subdir>
404 +             <subdir>d4vm/apps</subdir>
405 +             <subdir>remapmags/apps</subdir>
406 +             <subdir>synop/apps</subdir>
407 +             <subdir>polarfield/apps</subdir>
408          </subdirs>
409          <filters>
410               <filter>
# Line 164 | Line 418 | __PROJ__
418          <subdirs>
419              <subdir>apps</subdir>
420          </subdirs>
421 +        <filters>
422 +             <filter>
423 +                  <name>COMPILER</name>
424 +                  <value>icc</value>
425 +             </filter>
426 +       </filters>
427     </proj>
428     <proj>
429          <name>vfisv</name>
# Line 177 | Line 437 | __PROJ__
437              <subdir>apps</subdir>
438          </subdirs>
439     </proj>
440 +   <proj>
441 +        <name>cgem</name>
442 +        <subdirs>
443 +             <subdir>apps</subdir>
444 +             <subdir>lorentz/apps</subdir>
445 +             <subdir>pdfi/apps</subdir>
446 +        </subdirs>
447 +        <filters>
448 +             <filter>
449 +                  <name>COMPILER</name>
450 +                  <value>icc</value>
451 +             </filter>
452 +       </filters>
453 +   </proj>
454   </projects>
181 __END__
455   __PROJCFG__
456   #! /bin/csh -f
457  
458 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
186 < # directory).
187 <
188 < find ../proj/lev0/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
458 > set PERLBIN = ""
459  
460 < find ../proj/datacapture/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
461 < __END__
462 < __LIBS__
463 < # JSOC_SDP third-party libraries used by base
464 <    POSTGRES_LIB = pq
195 <    CFITSIO_LIB = cfitsio
196 <
197 <    ifeq ($(JSOC_MACHINE), linux_x86_64)
198 <      POSTGRES_INCS = /usr/include
199 <      POSTGRES_LIBS = /usr/lib64
200 <      CFITSIO_INCS = /home/jsoc/include
201 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
460 > if ($PERLBIN == "") then
461 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
462 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
463 >    else
464 >        set PERLBIN = "perl"
465      endif
466 + endif
467  
468 <    ifeq ($(JSOC_MACHINE), linux_ia32)
469 <      POSTGRES_INCS = /usr/include
470 <      POSTGRES_LIBS = /usr/lib
207 <      CFITSIO_INCS = /home/jsoc/include
208 <      CFITSIO_LIBS = /home/jsoc/lib/linux-ia32
209 <    endif
210 <
211 <    ifeq ($(JSOC_MACHINE), linux_ia64)
212 <      POSTGRES_INCS = /usr/include/pgsql
213 <      POSTGRES_LIBS = /usr/lib
214 <      CFITSIO_INCS = /home/jsoc/include
215 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
216 <    endif
217 <
218 < # JSOC_SDP third-party libraries used by the project directories
219 <    FFTW3_LIB = fftw3
220 <
221 <    ifeq ($(JSOC_MACHINE), linux_ia32)
222 <      FFTW_INCS = /home/jsoc/include
223 <      FFTW_LIBS = /home/jsoc/lib/linux-ia32
224 <    endif
225 <
226 <    ifeq ($(JSOC_MACHINE), linux_x86_64)
227 <      FFTW_INCS = /home/jsoc/include
228 <      FFTW_LIBS = /home/jsoc/lib/linux-x86_64
229 <    endif
230 <
231 < # Try to specialize for non-default machines
232 <    ifeq ($(MACHTYPE), j1)
233 <      POSTGRES_INCS = /usr/include/pgsql
234 <      POSTGRES_LIBS = /usr/lib64
235 <      CFITSIO_INCS = /home/jsoc/include
236 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
237 <    endif
238 <
239 <    ifeq ($(MACHTYPE), d02)
240 <      POSTGRES_INCS = /usr/include/pgsql
241 <      POSTGRES_LIBS = /usr/lib
242 <      CFITSIO_INCS = __CFITSIO_NOT_INSTALLED__
243 <      CFITSIO_LIBS = __CFITSIO_NOT_INSTALLED__
244 <   endif
245 <
246 <    ifeq ($(MACHTYPE), dbserver)
247 <      POSTGRES_INCS = /usr/local/pgsql/include
248 <      POSTGRES_LIBS = /usr/lib64
249 <      CFITSIO_INCS = /home/jsoc/include
250 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
251 <    endif
252 <
253 <    ifeq ($(MACHTYPE), cluster)
254 <      POSTGRES_INCS = __POSTGRES_DEVELOP_NOT_INSTALLED__
255 <      POSTGRES_LIBS = /usr/lib64
256 <      CFITSIO_INCS = /home/jsoc/include
257 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
258 <    endif
259 <
260 <    ifeq ($(MACHTYPE), dcs)
261 <      POSTGRES_INCS = /usr/include/pgsql
262 <      POSTGRES_LIBS = /usr/lib64
263 <      CFITSIO_INCS = /home/jsoc/include
264 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
265 <    endif
266 < # Set custom make file to tell the make system that the gcc cfitsio library is called
267 < # libcfitsio_gcc.a
268 <    ifeq ($(COMPILER), gcc)
269 <      ifeq ($(JSOC_MACHINE), linux_x86_64)
270 <        CFITSIO_LIB = cfitsio_gcc
271 <      endif
272 <    endif
273 < __END__
468 > # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
469 > # directory).
470 > find ../proj/lev0/scripts -mindepth 1 -path \*CVS -prune -o -print | ${PERLBIN} -MFile::Basename -n -e 'my($bn) = basename($_); chomp($bn); my($path) = $_; chomp($path); if (!(-e $bn)) { `ln -s $_`; if ($? >> 8 == 0) { print "   " . $path . " OK\n"; } else { print "   " . $path . " ERROR - could not create link\n"; } }'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines