diff hg-octave-dist.mk @ 4540:2a8b5cf2085c

allow stable-octave to build from hg
author John W. Eaton <jwe@octave.org>
date Tue, 21 Nov 2017 16:45:20 -0500
parents 8ec05e08aa22
children 7eebfda7daa1
line wrap: on
line diff
--- a/hg-octave-dist.mk	Tue Nov 21 12:26:13 2017 -0500
+++ b/hg-octave-dist.mk	Tue Nov 21 16:45:20 2017 -0500
@@ -40,12 +40,15 @@
 	$(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' all && \
 	$(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' install && \
 	$(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' dist && \
-	mv '$(default-octave_FILE)' '$(PKG_DIR)'
+	mv '$($(OCTAVE_TARGET)_FILE)' '$(PKG_DIR)'
 
 .PHONY: update-hg-octave-repo
 update-hg-octave-repo:
 	if [ -d octave-hg-repo ]; then \
-	  cd octave-hg-repo && hg pull -u; \
+	  cd octave-hg-repo \
+	    && hg pull && hg update $(hg-octave-branch); \
 	else \
-	  hg clone http://octave.org/hg/octave octave-hg-repo; \
+	  hg clone http://octave.org/hg/octave octave-hg-repo \
+	    && cd octave-hg-repo \
+	    && hg pull && hg update $(hg-octave-branch); \
 	fi