Changeset 696

Timestamp:

Nov 17, 2008, 4:44:46 PM (12 years ago)

Author:

Peter Johansson

Message:

fixes #348

Location:

trunk

Files:

• bin/Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• lib/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)

trunk/bin/Makefile.am

@@ -29 +29 @@
 noinst_HEADERS = Parameter.h
 
-LDADD = @top_builddir@/lib/libsvndigest.a $(SVNDIGEST_LIBS)
+LDADD = $(top_builddir)/lib/libsvndigest.a $(SVNDIGEST_LIBS)
 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
 
-AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/lib $(SVNDIGEST_CPPFLAGS)
 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 

trunk/configure.ac

@@ -154 +154 @@
 
 # checking if we build in a subversion WC
+AC_MSG_CHECKING([if we build from subversion wc])
 wc_found="no";
 if (test "$SVNVERSION" != "no" && 
@@ -160 +161 @@
   wc_found="yes";
 fi
+AC_MSG_RESULT([$wc_found])
 AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no")
 

trunk/lib/Makefile.am

@@ -54 +54 @@
 
 if HAVE_SVN_WC
-@srcdir@/subversion_info.cc: subversion_info.cc.tmp
-  @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \
-  @srcdir@/subversion_info.cc
+$(srcdir)/subversion_info.cc: subversion_info.cc.tmp
+  @$(SHELL) $(top_srcdir)/build_support/move-if-change subversion_info.cc.tmp \
+  $(srcdir)/subversion_info.cc
 
 subversion_info.cc.tmp: FORCE
@@ -63 +63 @@
   year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
   $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
-  -e 's/sub_2_svn_year/'$$year'/g'  @srcdir@/subversion_info.cc.in >> $@ ;
+  -e 's/sub_2_svn_year/'$$year'/g' $(srcdir)/subversion_info.cc.in >> $@ ;
 endif
 

trunk/test/Makefile.am

@@ -42 +42 @@
 
 
-LDADD = @builddir@/libsvndigesttest.a \
-  @top_builddir@/lib/libsvndigest.a \
+LDADD = $(builddir)/libsvndigesttest.a \
+  $(top_builddir)/lib/libsvndigest.a \
   $(SVNDIGEST_LIBS)
 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
@@ -68 +68 @@
 
 # some tests need the test repo to be checked out
-stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
-copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
+stats_test_DEPENDENCIES = $(toy_project) $(top_builddir)/lib/libsvndigest.a
+copyright_test_DEPENDENCIES = $(toy_project) $(top_builddir)/lib/libsvndigest.a
 
 $(toy_project):