Changeset 6023 for branches/1.4


Ignore:
Timestamp:
Feb 18, 2016 11:15:48 PM (6 years ago)
Author:
ldelgass
Message:

merge r5811 from trunk (symlinks and svnversion)

Location:
branches/1.4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5811
  • branches/1.4/Makefile.in

    r5029 r6023  
    2222pkg_path        := $(shell dirname $(prefix))
    2323pkg_name        := $(shell basename $(prefix))
    24 SVN_VERSION     := $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
     24SVN_VERSION     := $(shell readlink -e $(srcdir) | xargs svnversion | sed 's/Unversioned directory/unknown/')
    2525
    2626rappture_binary_tarfile = rappture-$(os)-$(machine)-$(build_date).tar.gz
  • branches/1.4/lang/tcl/src/Makefile.in

    r5471 r6023  
    4040  -I$(includedir)
    4141RAPPTURE_VERSION = @PACKAGE_VERSION@
    42 SVN_VERSION     := $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
     42SVN_VERSION     := $(shell readlink -e $(srcdir) | xargs svnversion | sed 's/Unversioned directory/unknown/')
    4343DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
    4444                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
  • branches/1.4/src/core/Makefile.in

    r5850 r6023  
    1313INSTALL         = @INSTALL@
    1414MKDIR_P         = @MKDIR_P@
    15 SVN_VERSION     := $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
     15SVN_VERSION     := $(shell readlink -e $(srcdir) | xargs svnversion | sed 's/Unversioned directory/unknown/')
    1616RAPPTURE_VERSION = @PACKAGE_VERSION@
    1717CXX             = @CXX@
Note: See TracChangeset for help on using the changeset viewer.