Index: utils/Makefile_latest.installall ================================================================== --- utils/Makefile_latest.installall +++ utils/Makefile_latest.installall @@ -14,12 +14,14 @@ @echo You may need to do the following first: @echo sudo apt-get install libreadline-dev @echo sudo apt-get install libwebkitgtk-dev @echo sudo apt-get install libmotif3 @echo You are using PREFIX=$(PREFIX) - @echo You are using proxy="$(proxy)" - @echo If needed set proxy to host.dom:port + @echo You are using PROXY="$(PROXY)" + @echo If needed set PROXY to host.dom:port + @echo http_proxy=$(http_proxy) + @echo PROX=$(PROX) @echo @echo To make all do: make all # Put the installation here ifeq ($(PREFIX),) @@ -30,10 +32,13 @@ PROXY= # Select version of chicken, sqlite3 etc CHICKEN_VERSION=4.8.0 SQLITE3_VERSION=3071401 + +# Override IUPBRANCH to use other than trunk +IUPBRANCH=trunk # Eggs to install (straightforward ones) EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \ @@ -73,10 +78,11 @@ else ARCHSIZE=64_ endif CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g') +CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS)" $(CHICKEN_INSTALL) $(PROX) -D no-library-checks -feature disable-iup-web iup # CSC_OPTIONS=-I$(PREFIX)/include -L$(CSCLIBS) all : chkn eggs libiup logprobin chkn : $(CHICKEN_INSTALL) @@ -139,11 +145,11 @@ iuplib.fossil : fossil clone http://www.kiatoa.com/fossils/iuplib iuplib.fossil iup/installall.sh : iuplib.fossil mkdir -p iup - cd iup && if [ -e installall.sh ];then fossil update; else fossil open ../iuplib.fossil; fi + cd iup && if [ -e installall.sh ];then fossil update $(IUPBRANCH); else fossil open ../iuplib.fossil;fossil update $(IUPBRANCH); fi iup/iup/alldone : iup/installall.sh cd iup && ./makeall.sh $(PREFIX)/lib/libiup.so : iup/iup/alldone