Changeset 2350 for trunk/packages

Timestamp:

Aug 13, 2011, 2:32:38 PM (13 years ago)

Author:

ldelgass

Message:

Some build fixes for new nanoscale

Location:

trunk/packages/vizservers

Files:

• Makefile.in (modified) (2 diffs)
• configure.in (modified) (3 diffs)
• nanoscale/Makefile.in (modified) (3 diffs)
• start_nanoscale.sh.in (modified) (1 diff)

trunk/packages/vizservers/Makefile.in

@@ -48 +48 @@
         done
         $(INSTALL) -m 0555 start_viz.sh $(bindir)/start_viz.sh
-        $(INSTALL) -m 0555 start_viz.sh $(bindir)/start_nanoscale.sh
+        $(INSTALL) -m 0555 start_nanoscale.sh $(bindir)/start_nanoscale.sh
 
 clean:
@@ -59 +59 @@
           $(MAKE) -C $$i distclean ; \
         done
-        rm -f Makefile start_viz.sh *~
+        $(RM) -r Makefile config.cache config.log config.status start_viz.sh start_nanoscale.sh *~ autom4te.cache

trunk/packages/vizservers/configure.in

@@ -317 +317 @@
 CPPFLAGS=$save_CPPFLAGS
 
- if test "${CG_DIR}" = "/usr" ; then
+if test "${CG_DIR}" = "/usr" ; then
   CG_DIR=""
 else 
@@ -356 +356 @@
 
 AC_OUTPUT([
-  Makefile \
+   Makefile \
    nanoscale/Makefile \
    nanoscale/renderservers.tcl \
@@ -370 +370 @@
    vtkvis/Doxyfile \
    vtkvis/Makefile \
-   start_viz.sh
+   start_viz.sh \
    start_nanoscale.sh])
-  

trunk/packages/vizservers/nanoscale/Makefile.in

@@ -19 +19 @@
 
 INSTALL         = @INSTALL@
-INSTALL_PROGRAM = ${INSTALL} -m 555
-INSTALL_DATA    = ${INSTALL} -m 444
-INSTALL_SCRIPT  = ${INSTALL} -m 444
+INSTALL_PROGRAM = ${INSTALL} -m 0555
+INSTALL_DATA    = ${INSTALL} -m 0444
+INSTALL_SCRIPT  = ${INSTALL} -m 0444
+RM              = rm -f
 
 SERVER_OBJS     = server2.o
@@ -46 +47 @@
 install: nanoscale renderservers.tcl
         $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
-        $(INSTALL) -m 0444 renderservers.tcl $(libdir)
+        $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
 
 client: $(CLIENT_OBJS)
@@ -54 +55 @@
 
 clean:
-        rm -rf a.out $(SERVER_OBJS) *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
+        $(RM) -r a.out $(SERVER_OBJS) *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
 
 distclean: clean
-        rm Makefile
+        $(RM) Makefile config.h renderservers.tcl
 

trunk/packages/vizservers/start_nanoscale.sh.in

@@ -11 +11 @@
 libdir="@libdir@"
 . ${bindir}/rappture.env
+
+# lspci is either in /sbin or /usr/sbin
+PATH=/sbin:/usr/sbin:${PATH}
+export PATH
 
 # Determine the number of video cards we have.  The new render server