Browse Source

Fix to enable building into directory out of source tree

DrYak 10 years ago
parent
commit
caf5a2f327
2 changed files with 3 additions and 3 deletions
  1. 2 2
      Makefile.am
  2. 1 1
      m4/bundled_lib.m4

+ 2 - 2
Makefile.am

@@ -92,8 +92,8 @@ TEST_EXTENSIONS = .sh
 
 
 .PHONY: update-version
 .PHONY: update-version
 update-version:
 update-version:
-	./gen-version.sh >version.h.new
-	cmp version.h version.h.new && rm version.h.new || mv version.h.new version.h
+	$(top_srcdir)/gen-version.sh >version.h.new
+	cmp $(top_srcdir)/version.h version.h.new && rm version.h.new || mv version.h.new $(top_srcdir)/version.h
 version.h: update-version
 version.h: update-version
 bfgminer_SOURCES += version.c version.h
 bfgminer_SOURCES += version.c version.h
 BUILT_SOURCES = version.h
 BUILT_SOURCES = version.h

+ 1 - 1
m4/bundled_lib.m4

@@ -50,7 +50,7 @@ AC_DEFUN([BFG_BUNDLED_LIB_VARS],[
 	BFG_CHECK_LD_ORIGIN
 	BFG_CHECK_LD_ORIGIN
 	_AC_SRCDIRS(["$ac_dir"])
 	_AC_SRCDIRS(["$ac_dir"])
 	$1_CFLAGS='-I'"${ac_abs_top_srcdir}"'/$2'
 	$1_CFLAGS='-I'"${ac_abs_top_srcdir}"'/$2'
-	$1_LIBS='-L'"${ac_abs_top_srcdir}"'/$2/.libs -Wl,-rpath,\$$ORIGIN/$2/.libs'"$origin_LDFLAGS"' m4_foreach_w([mylib],[$3],[ -l[]mylib])'
+	$1_LIBS='-L'"${ac_abs_top_builddir}"'/$2/.libs -Wl,-rpath,\$$ORIGIN/$2/.libs'"$origin_LDFLAGS"' m4_foreach_w([mylib],[$3],[ -l[]mylib])'
 	$1_SUBDIRS=$2
 	$1_SUBDIRS=$2
 	$1_EXTRADEPS=$1_directory
 	$1_EXTRADEPS=$1_directory
 	BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES
 	BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES