Changeset 696 for trunk


Ignore:
Timestamp:
Nov 17, 2008, 4:44:46 PM (13 years ago)
Author:
Peter Johansson
Message:

fixes #348

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/Makefile.am

    r693 r696  
    2929noinst_HEADERS = Parameter.h
    3030
    31 LDADD = @top_builddir@/lib/libsvndigest.a $(SVNDIGEST_LIBS)
     31LDADD = $(top_builddir)/lib/libsvndigest.a $(SVNDIGEST_LIBS)
    3232AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    3333
    34 AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
     34AM_CPPFLAGS = -I$(top_srcdir)/lib $(SVNDIGEST_CPPFLAGS)
    3535AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    3636
  • trunk/configure.ac

    r693 r696  
    154154
    155155# checking if we build in a subversion WC
     156AC_MSG_CHECKING([if we build from subversion wc])
    156157wc_found="no";
    157158if (test "$SVNVERSION" != "no" &&
     
    160161  wc_found="yes";
    161162fi
     163AC_MSG_RESULT([$wc_found])
    162164AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no")
    163165
  • trunk/lib/Makefile.am

    r693 r696  
    5454
    5555if HAVE_SVN_WC
    56 @srcdir@/subversion_info.cc: subversion_info.cc.tmp
    57   @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \
    58   @srcdir@/subversion_info.cc
     56$(srcdir)/subversion_info.cc: subversion_info.cc.tmp
     57  @$(SHELL) $(top_srcdir)/build_support/move-if-change subversion_info.cc.tmp \
     58  $(srcdir)/subversion_info.cc
    5959
    6060subversion_info.cc.tmp: FORCE
     
    6363  year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
    6464  $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
    65   -e 's/sub_2_svn_year/'$$year'/g'  @srcdir@/subversion_info.cc.in >> $@ ;
     65  -e 's/sub_2_svn_year/'$$year'/g' $(srcdir)/subversion_info.cc.in >> $@ ;
    6666endif
    6767
  • trunk/test/Makefile.am

    r693 r696  
    4242
    4343
    44 LDADD = @builddir@/libsvndigesttest.a \
    45   @top_builddir@/lib/libsvndigest.a \
     44LDADD = $(builddir)/libsvndigesttest.a \
     45  $(top_builddir)/lib/libsvndigest.a \
    4646  $(SVNDIGEST_LIBS)
    4747AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
     
    6868
    6969# some tests need the test repo to be checked out
    70 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
    71 copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
     70stats_test_DEPENDENCIES = $(toy_project) $(top_builddir)/lib/libsvndigest.a
     71copyright_test_DEPENDENCIES = $(toy_project) $(top_builddir)/lib/libsvndigest.a
    7272
    7373$(toy_project):
Note: See TracChangeset for help on using the changeset viewer.