Changeset 2350


Ignore:
Timestamp:
Aug 13, 2011 2:32:38 PM (9 years ago)
Author:
ldelgass
Message:

Some build fixes for new nanoscale

Location:
trunk/packages/vizservers
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/Makefile.in

    r2346 r2350  
    4848        done
    4949        $(INSTALL) -m 0555 start_viz.sh $(bindir)/start_viz.sh
    50         $(INSTALL) -m 0555 start_viz.sh $(bindir)/start_nanoscale.sh
     50        $(INSTALL) -m 0555 start_nanoscale.sh $(bindir)/start_nanoscale.sh
    5151
    5252clean:
     
    5959          $(MAKE) -C $$i distclean ; \
    6060        done
    61         rm -f Makefile start_viz.sh *~
     61        $(RM) -r Makefile config.cache config.log config.status start_viz.sh start_nanoscale.sh *~ autom4te.cache
  • trunk/packages/vizservers/configure.in

    r2348 r2350  
    317317CPPFLAGS=$save_CPPFLAGS
    318318
    319  if test "${CG_DIR}" = "/usr" ; then
     319if test "${CG_DIR}" = "/usr" ; then
    320320  CG_DIR=""
    321321else
     
    356356
    357357AC_OUTPUT([
    358   Makefile \
     358   Makefile \
    359359   nanoscale/Makefile \
    360360   nanoscale/renderservers.tcl \
     
    370370   vtkvis/Doxyfile \
    371371   vtkvis/Makefile \
    372    start_viz.sh
     372   start_viz.sh \
    373373   start_nanoscale.sh])
    374  
  • trunk/packages/vizservers/nanoscale/Makefile.in

    r2347 r2350  
    1919
    2020INSTALL         = @INSTALL@
    21 INSTALL_PROGRAM = ${INSTALL} -m 555
    22 INSTALL_DATA    = ${INSTALL} -m 444
    23 INSTALL_SCRIPT  = ${INSTALL} -m 444
     21INSTALL_PROGRAM = ${INSTALL} -m 0555
     22INSTALL_DATA    = ${INSTALL} -m 0444
     23INSTALL_SCRIPT  = ${INSTALL} -m 0444
     24RM              = rm -f
    2425
    2526SERVER_OBJS     = server2.o
     
    4647install: nanoscale renderservers.tcl
    4748        $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
    48         $(INSTALL) -m 0444 renderservers.tcl $(libdir)
     49        $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
    4950
    5051client: $(CLIENT_OBJS)
     
    5455
    5556clean:
    56         rm -rf a.out $(SERVER_OBJS) *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
     57        $(RM) -r a.out $(SERVER_OBJS) *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
    5758
    5859distclean: clean
    59         rm Makefile
     60        $(RM) Makefile config.h renderservers.tcl
    6061
  • trunk/packages/vizservers/start_nanoscale.sh.in

    r2348 r2350  
    1111libdir="@libdir@"
    1212. ${bindir}/rappture.env
     13
     14# lspci is either in /sbin or /usr/sbin
     15PATH=/sbin:/usr/sbin:${PATH}
     16export PATH
    1317
    1418# Determine the number of video cards we have.  The new render server
Note: See TracChangeset for help on using the changeset viewer.