Browse Source

No longer call configure from autogen.sh

Luke Dashjr 13 years ago
parent
commit
b83b6dbed4
3 changed files with 7 additions and 9 deletions
  1. 1 1
      README
  2. 0 5
      autogen.sh
  3. 6 3
      openwrt/bfgminer/Makefile

+ 1 - 1
README

@@ -104,7 +104,7 @@ If you are on 32 bit, x86_64 in the 2nd last line should be x86
 Basic *nix build instructions:
 Basic *nix build instructions:
 
 
 ./autogen.sh    # only needed if building from git repo
 ./autogen.sh    # only needed if building from git repo
-./configure     # NOT needed if autogen.sh used
+./configure
 make
 make
 
 
 On Mac OS X, you can use Homebrew to install the dependency libraries. When you
 On Mac OS X, you can use Homebrew to install the dependency libraries. When you

+ 0 - 5
autogen.sh

@@ -16,8 +16,3 @@ echo 'Running autoreconf -if...'
 	rm -f aclocal.m4 ltmain.sh
 	rm -f aclocal.m4 ltmain.sh
 	autoreconf -if
 	autoreconf -if
 )
 )
-
-if test -z "$NOCONFIGURE" ; then
-	echo 'Configuring...'
-	"${bs_dir}"/configure "$@"
-fi

+ 6 - 3
openwrt/bfgminer/Makefile

@@ -64,9 +64,12 @@ TARGET_CFLAGS += -std=gnu99
 
 
 CONFIGURE_ARGS += --without-libudev
 CONFIGURE_ARGS += --without-libudev
 
 
-# Need to remake configure etc to pick up on cross-compiler libtool
-CONFIGURE_VARS += NOSUBMODULES=1
-CONFIGURE_CMD = ./autogen.sh
+define Build/Configure
+	# Need to remake configure etc to pick up on cross-compiler libtool
+	( cd $(PKG_BUILD_DIR); NOSUBMODULES=1 ./autogen.sh; )
+	
+	$(call Build/Configure/Default)
+endef
 
 
 define Package/$(PKG_NAME)/install
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib