Changeset 4501 for branches/1.3/packages


Ignore:
Timestamp:
Jul 14, 2014, 6:36:23 PM (10 years ago)
Author:
ldelgass
Message:

merge r4364 from trunk

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4364

  • branches/1.3/packages/vizservers/nanoscale/Makefile.in

    r2557 r4501  
    3030TCL_INC_SPEC    = @TCL_INC_SPEC@
    3131LD_RUN_PATH     = $(libdir)
     32LOGDIR          = @LOGDIR@
     33SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3234
    33 DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\"
     35DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
     36                -DSVN_VERSION=\"$(SVN_VERSION)\" \
     37                -DLOGDIR=\"$(LOGDIR)\"
    3438INCLUDES        = -I. $(TCL_INC_SPEC)
    3539LIBS            = $(TCL_LIB_SPEC) \

  • branches/1.3/packages/vizservers/pymolproxy/Makefile.in

    r3403 r4501  
    2929VPATH =         $(srcdir)
    3030
    31 SVN_VERSION     = $(shell svnversion $(srcdir))
     31SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3232STATSDIR        = @STATSDIR@
    3333

  • branches/1.3/packages/vizservers/vtkvis/Makefile.in

    r4239 r4501  
    3131MKDIR_P         = @MKDIR_P@
    3232
    33 SVN_VERSION     = $(shell svnversion $(srcdir))
     33SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3434STATSDIR        = @STATSDIR@
    3535
Note: See TracChangeset for help on using the changeset viewer.