X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=Externals%2Fcommon.mk;h=42386e5a418350a169fb5f1811b7ff35b4f8cac8;hb=a30bd6e6d712dc6d4e64e33414b461e1377d4056;hp=e74b4942f46ba34130e23d345d9d532a855b16b1;hpb=3848feb1df64622ad05cbc6b4e6ac3b550e8d805;p=tpg%2Facess2.git

diff --git a/Externals/common.mk b/Externals/common.mk
index e74b4942..42386e5a 100644
--- a/Externals/common.mk
+++ b/Externals/common.mk
@@ -15,9 +15,11 @@ else
  $(error No BFD translation for $(ARCH) in Externals/common.mk)
 endif
 
-PREFIX=$(ACESSDIR)/Externals/Output/common
-EPREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
-SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(ARCH)
+#PREFIX=$(ACESSDIR)/Externals/Output
+#EPREFIX=$(ACESSDIR)/Externals/Output/$(BFD)
+PREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
+EPREFIX=$(PREFIX)
+SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(BFD)
 HOST=$(BFD)-acess_proxy-elf
 
 #
@@ -31,6 +33,7 @@ HOST=$(BFD)-acess_proxy-elf
 # [?]ARCHIVE : Optional forced archive (Defaults to latest)
 # [?]CONFIGURE_LINE : Command to create makefile (defaults to autotools configure)
 # [?]NOBDIR : Set to non-empty to disable use of a separate build dir
+# [?]AUTORECONF : Set to non-empty to regenerate ./configure
 
 
 BTARGETS ?= all
@@ -61,18 +64,18 @@ else
 endif
 SDIR := ../$(DIR)
 
-CONFIGURE_LINE ?= ./configure --host=$(HOST) --prefx=$(PREFIX) --eprefix=$(EPREFIX) $(CONFIGURE_ARGS)
+CONFIGURE_LINE ?= $(SDIR)/configure --host=$(HOST) --prefix=$(PREFIX) --exec-prefix=$(EPREFIX) $(CONFIGURE_ARGS)
 
 .PHONY: all clean install _patch _build
 
+install: all
+	cd $(BDIR) && make $(ITARGETS)
+
 all: $(DIR) _patch _build
 
 clean:
 	rm -rf $(DIR) $(BDIR)
 
-install: all
-	cd $(BDIR) && make $(ITARGETS)
-
 $(DIR): $(ARCHIVE)
 	tar -xf $(ARCHIVE)
 
@@ -86,7 +89,13 @@ $(DIR)/%: patches/%
 
 _patch: $(DIR) $(addprefix $(DIR)/,$(PATCHES))
 
-$(BDIR)/Makefile: _patch ../common.mk Makefile 
+_autoreconf: _patch
+ifeq ($(AUTORECONF),)
+else
+	cd $(DIR) && autoreconf --force --install
+endif
+
+$(BDIR)/Makefile: _autoreconf ../common.mk Makefile 
 	mkdir -p $(BDIR)
 	cd $(BDIR) && $(CONFIGURE_LINE)