Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -425,11 +425,11 @@
 	 (uname #f))
     (if (null? (car uname-res))
 	"unknown"
 	(caar uname-res))))
 	      
-(define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR")))
+(define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF")))
   (let ((envvars (get-environment-variables))
         (whitesp (regexp "[^a-zA-Z0-9_\\-:,.\\/%$]")))
      (with-output-to-file (conc fname ".csh")
        (lambda ()
           (for-each (lambda (keyval)

Index: utils/Makefile.installall
==================================================================
--- utils/Makefile.installall
+++ utils/Makefile.installall
@@ -1,31 +1,28 @@
 
-# Copyright 2013, Matthew Welland.
+# Copyright 2013,2014 Matthew Welland.
 # 
 #  This program is made available under the GNU GPL version 2.0 or
 #  greater. See the accompanying file COPYING for details.
 # 
 #  This program is distributed WITHOUT ANY WARRANTY; without even the
 #  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #  PURPOSE.
 
+# make PREFIX=/mfs/pkgs/chicken/chicken-core all
+
 help :
 	@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 -OR- set KTYPE=26g4
-	@echo KTYPE can be 26, 26g4, or 32
-	@echo KTYPE=$KTYPE
-	@echo You are using PREFIX=$PREFIX
-	@echo You are using proxy="$(proxy)"
-	@echo If needed set proxy to host.dom:port
-	@echo 
-	@echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :"
-	@echo ADDITIONAL_LIBPATH=$(ADDITIONAL_LIBPATH)
-	@echo  
-	@echo To use previous IUP libraries set USEOLDIUP to yes
-	@echo USEOLDIUP=$(USEOLDIUP)
+	@echo sudo apt-get install libmotif3
+	@echo For IUP set IUPBRANCH, currently $(IUPBRANCH)
+	@echo You are using PREFIX=$(PREFIX)
+	@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),)
@@ -33,32 +30,34 @@
 endif
 
 # Set this on the command line of your make call if needed: make PROXY=host.com:1234
 PROXY=
 
-# Select IUP library type
-KTYPE=26g4
-
 # Select version of chicken, sqlite3 etc
-CHICKEN_VERSION=4.8.0
-SQLITE3_VERSION=3071401
+CHICKEN_VERSION=4.9.0.1
+SQLITE3_VERSION=3080500
+# http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
+
+# Override IUPBRANCH to use other than trunk
+IUPBRANCH=iup-3.10.1
 
 # 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 \
-     spiffy-directory-listing ssax sxml-serializer sxml-modifications
+     spiffy-directory-listing ssax sxml-serializer sxml-modifications sql-de-lite \
+     srfi-19 refdb ini-file
 
 #
 # Derived variables
 #
 
 ifeq ($(PROXY),)
-PROX=
+PROX:=
 else
-http_proxy=http://$(PROXY)
-PROX="-proxy $(PROXY)"
+http_proxy:=http://$(PROXY)
+PROX:=-proxy $(PROXY)
 endif
 
 BUILDHOME=$(PWD)
 PATH:=$(PREFIX)/bin:$(PATH)
 LIBPATH=$(PREFIX)/lib$(ADDITIONAL_LIBPATH)
@@ -80,32 +79,30 @@
 ARCHSIZE=
 else
 ARCHSIZE=64_
 endif
 
-IUPFILES=cd-5.5.1_Linux$(KTYPE)_$(ARCHSIZE)lib.tar.gz im-3.8_Linux$(KTYPE)_$(ARCHSIZE)lib.tar.gz iup-3.6_Linux$(KTYPE)_$(ARCHSIZE)lib.tar.gz
 CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g')
-CSC_OPTIONS=-I$(PREFIX)/include -L$(CSCLIBS)
+CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS)"
+# CSC_OPTIONS=-I$(PREFIX)/include -L$(CSCLIBS)
 
-all : chkn eggs libiup sqlite3 logprobin mutils
+all : chkn eggs libiup logprobin $(PREFIX)/lib/sqlite3.so $(PREFIX)/bin/hs
 
 chkn : $(CHICKEN_INSTALL)
 
 eggs : $(EGGSOFILES)
 
-sqlite3 :  $(CHICKEN_EGG_DIR)/sqlite3.so
-
 libiup : $(PREFIX)/lib/libavcall.a $(CHICKEN_EGG_DIR)/iup.so $(CHICKEN_EGG_DIR)/canvas-draw.so
 
 logprobin : $(PREFIX)/bin/logpro
 
 $(PREFIX)/bin/logpro : $(CHICKEN_EGG_DIR)/regex-literals.so
 	$(CHICKEN_INSTALL) logpro
 
 # Silly rule to make installing eggs more makeish, I don't understand why I need the basename
 $(CHICKEN_EGG_DIR)/%.so : eggflags/%.flag
-	$(CHICKEN_INSTALL) $(PROX) $(shell basename $*)
+	$(CHICKEN_INSTALL) $(PROX) -keep-installed $(shell basename $*)
 
 $(EGGFLAGS) : # $(CHICKEN_INSTALL)
 	mkdir -p eggflags
 	touch $(EGGFLAGS)
 
@@ -114,77 +111,97 @@
 setup-chicken4x.sh : $(EGGFLAGS)
 	(echo "export PATH=$(PATH)" > setup-chicken4x.sh)
 	(echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" >> setup-chicken4x.sh)
 	mkdir -p $(PREFIX)
 
-# Download chicken source
-chicken-$(CHICKEN_VERSION).tar.gz : 
-	wget http://code.call-cc.org/releases/$(CHICKEN_VERSION)/chicken-$(CHICKEN_VERSION).tar.gz
-
-# NB// Must touch csi.scm since tar puts original date on it and deps are wrong then
-chicken-$(CHICKEN_VERSION)/csi.scm : chicken-$(CHICKEN_VERSION).tar.gz
-	tar xfvz chicken-$(CHICKEN_VERSION).tar.gz
-	touch -c chicken-$(CHICKEN_VERSION)/csi.scm
-
-$(CHICKEN_INSTALL) : chicken-$(CHICKEN_VERSION)/csi.scm setup-chicken4x.sh
-	cd chicken-$(CHICKEN_VERSION);make PLATFORM=linux PREFIX=$(PREFIX)
-	cd chicken-$(CHICKEN_VERSION);make PLATFORM=linux PREFIX=$(PREFIX) install
-
-sqlite-autoconf-$(SQLITE3_VERSION).tar.gz : 
-	wget http://www.sqlite.org/sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
-
-sqlite-autoconf-$(SQLITE3_VERSION) : sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
-	tar xfz sqlite-autoconf-$(SQLITE3_VERSION).tar.gz 
-
-$(PREFIX)/bin/sqlite3 : sqlite-autoconf-$(SQLITE3_VERSION)
-	(cd sqlite-autoconf-$(SQLITE3_VERSION);./configure --prefix=$(PREFIX);make;make install)
-
-$(CHICKEN_EGG_DIR)/sqlite3.so : $(PREFIX)/bin/sqlite3
+chicken-core/chicken.scm : chicken-$(CHICKEN_VERSION).tar.gz
+	tar xfz chicken-$(CHICKEN_VERSION).tar.gz
+	ln -sf chicken-$(CHICKEN_VERSION) chicken-core
+
+
+chicken-4.9.0rc1.tar.gz : 
+	wget http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-4.9.0rc1.tar.gz
+
+chicken-4.9.0.1.tar.gz :
+	wget http://code.call-cc.org/releases/4.9.0/chicken-4.9.0.1.tar.gz
+
+# git clone git://code.call-cc.org/chicken-core
+# git clone http://code.call-cc.org/git/chicken-core.git
+
+$(CHICKEN_INSTALL) : chicken-core/chicken.scm setup-chicken4x.sh
+	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX)
+	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX) install
+
+#======================================================================
+# S Q L I T E 3
+#======================================================================
+
+sqlite-autoconf-$(SQLITE3_VERSION).tar.gz :
+	wget  http://www.sqlite.org/2014/sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
+
+sqlite-autoconf-$(SQLITE3_VERSION)/config.log : sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
+	tar xfz  sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
+
+$(PREFIX)/bin/sqlite3 : sqlite-autoconf-$(SQLITE3_VERSION)/config.log
+	cd sqlite-autoconf-$(SQLITE3_VERSION);./configure --prefix=$(PREFIX);make;make install
+
+$(PREFIX)/lib/sqlite3.so : $(PREFIX)/bin/sqlite3
 	CSC_OPTIONS="-I$(PREFIX)/include -L$(PREFIX)/lib" $(CHICKEN_INSTALL) $(PROX) sqlite3
 
-mutils : $(CHICKEN_EGG_DIR)/margs.so $(CHICKEN_EGG_DIR)/qtree.so # $(CHICKEN_EGG_DIR)/dbi.so 
+#======================================================================
+# M A T T S   U T I L S
+#======================================================================
+
+opensrc.fossil :
+	fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil
 
-# Get and install my various utilities that haven't been eggified yet.
-opensrc/margs/margs.scm opensrc/dbi/dbi.scm opensrc/qtree/qtree.scm : $(CHICKEN_INSTALL) $(CHICKEN_EGG_DIR)/sqlite3.so
+opensrc/histstore/histstore.scm : opensrc.fossil
 	mkdir -p opensrc
-	cd opensrc;if [ ! -e opensrc.fossil ]; then fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil; fi
-	cd opensrc;if [ -e dbi/dbi.scm ]; then fossil update; else fossil open opensrc.fossil; fi
-
-$(CHICKEN_EGG_DIR)/dbi.so : opensrc/dbi/dbi.scm 
-	cd opensrc/dbi;chicken-install
-
-$(CHICKEN_EGG_DIR)/margs.so : opensrc/margs/margs.scm
-	cd opensrc/margs;chicken-install
-
-$(CHICKEN_EGG_DIR)/qtree.so : opensrc/qtree/qtree.scm
-	cd opensrc/qtree;chicken-install
-
-# 
-# IUP
-#
-
-ffcall.tar.gz :
-	wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz 
-
-ffcall/README : ffcall.tar.gz
-	tar xfvz ffcall.tar.gz
-	touch -c ffcall/README
-
+	cd opensrc;fossil open ../opensrc.fossil
+
+opensrc/histstore/hs : opensrc/histstore/histstore.scm chkn eggs $(PREFIX)/lib/sqlite3.so 
+	cd opensrc/histstore;$(PREFIX)/bin/csc histstore.scm -o hs
+
+$(PREFIX)/bin/hs : opensrc/histstore/hs 
+	cp -f opensrc/histstore/hs $(PREFIX)/bin/hs
+
+#======================================================================
+# I U P 
+#======================================================================
+
+ffcall.fossil :
+	fossil clone http://www.kiatoa.com/fossils/ffcall ffcall.fossil
+
+ffcall/README : ffcall.fossil
+	mkdir -p ffcall
+	cd ffcall && if [ -e README ];then fossil update; else fossil open ../ffcall.fossil; fi
+
+# NOTE: This worked fine *without* the enable-shared
+#
 $(PREFIX)/lib/libavcall.a : ffcall/README
 	cd ffcall;./configure --prefix=$(PREFIX) --enable-shared && make && make install
 
-$(IUPFILES) :
-	wget http://www.kiatoa.com/matt/iup/$@
-	cd $(PREFIX)/lib;tar xfvz $(BUILDHOME)/$@
-	mv $(PREFIX)/lib/include/* $(PREFIX)/include
+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 $(IUPBRANCH); else fossil open ../iuplib.fossil;fossil update $(IUPBRANCH); fi
+
+iup/alldone : iup/installall.sh $(PREFIX)/include/iup.h $(PREFIX)/lib/libiup.so
+	cd iup && ./makeall.sh
+
+$(PREFIX)/lib/libiup.so $(PREFIX)/include/iup.h : iup/installall.sh iup/alldone
+	cd iup && ./installall.sh
 
-$(PREFIX)/lib/libiup.so : $(IUPFILES)
-	touch -c $(PREFIX)/lib/libiup.so
+# $(PREFIX)/lib/libiup.so : iup/iup/alldone
+#	touch -c $(PREFIX)/lib/libiup.so
 
 $(CHICKEN_EGG_DIR)/iup.so : $(PREFIX)/lib/libiup.so
-	$(CHICKEN_INSTALL) $(PROX) -D no-library-checks -feature disable-iup-web iup
+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CSC_OPTIONS=$(CSC_OPTIONS) $(CHICKEN_INSTALL) $(PROX) -D no-library-checks -feature disable-iup-web iup
 
 $(CHICKEN_EGG_DIR)/canvas-draw.so :  $(PREFIX)/lib/libiup.so
-	$(CHICKEN_INSTALL) $(PROX) -D no-library-checks canvas-draw
+	CSC_OPTIONS=$(CSC_OPTIONS) $(CHICKEN_INSTALL) $(PROX) -D no-library-checks canvas-draw
+
 
 clean :
 	rm -rf chicken-4.8.0 eggflags ffcall sqlite-autoconf-$(SQLITE3_VERSION)

DELETED utils/Makefile_latest.installall
Index: utils/Makefile_latest.installall
==================================================================
--- utils/Makefile_latest.installall
+++ /dev/null
@@ -1,207 +0,0 @@
-
-# Copyright 2013,2014 Matthew Welland.
-# 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
-# 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
-
-# make PREFIX=/mfs/pkgs/chicken/chicken-core all
-
-help :
-	@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 For IUP set IUPBRANCH, currently $(IUPBRANCH)
-	@echo You are using PREFIX=$(PREFIX)
-	@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),)
-PREFIX=$(PWD)/target
-endif
-
-# Set this on the command line of your make call if needed: make PROXY=host.com:1234
-PROXY=
-
-# Select version of chicken, sqlite3 etc
-CHICKEN_VERSION=4.9.0.1
-SQLITE3_VERSION=3080500
-# http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
-
-# Override IUPBRANCH to use other than trunk
-IUPBRANCH=iup-3.10.1
-
-# 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 \
-     spiffy-directory-listing ssax sxml-serializer sxml-modifications sql-de-lite \
-     srfi-19 refdb ini-file
-
-#
-# Derived variables
-#
-
-ifeq ($(PROXY),)
-PROX:=
-else
-http_proxy:=http://$(PROXY)
-PROX:=-proxy $(PROXY)
-endif
-
-BUILDHOME=$(PWD)
-PATH:=$(PREFIX)/bin:$(PATH)
-LIBPATH=$(PREFIX)/lib$(ADDITIONAL_LIBPATH)
-LD_LIBRARY_PATH=$(LIBPATH)
-CHICKEN_INSTALL=$(PREFIX)/bin/chicken-install
-CHICKEN_EGG_DIR=$(PREFIX)/lib/chicken/6
-
-VPATH=$(CHICKEN_EGG_DIR):$(PWD)/eggflags
-
-vpath %.so $(CHICKEN_EGG_DIR)
-vpath %.flag eggflags
-
-EGGSOFILES=$(addprefix $(CHICKEN_EGG_DIR)/,$(addsuffix .so,$(EGGS)))
-EGGFLAGS=$(addprefix eggflags/,$(addsuffix .flag,$(EGGS)))
-
-# Stuff needed for IUP
-ISARCHX86_64=$(shell uname -a | grep x86_64)
-ifeq ($(ISARCHX86_64),)
-ARCHSIZE=
-else
-ARCHSIZE=64_
-endif
-
-CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g')
-CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS)"
-# CSC_OPTIONS=-I$(PREFIX)/include -L$(CSCLIBS)
-
-all : chkn eggs libiup logprobin $(PREFIX)/lib/sqlite3.so $(PREFIX)/bin/hs
-
-chkn : $(CHICKEN_INSTALL)
-
-eggs : $(EGGSOFILES)
-
-libiup : $(PREFIX)/lib/libavcall.a $(CHICKEN_EGG_DIR)/iup.so $(CHICKEN_EGG_DIR)/canvas-draw.so
-
-logprobin : $(PREFIX)/bin/logpro
-
-$(PREFIX)/bin/logpro : $(CHICKEN_EGG_DIR)/regex-literals.so
-	$(CHICKEN_INSTALL) logpro
-
-# Silly rule to make installing eggs more makeish, I don't understand why I need the basename
-$(CHICKEN_EGG_DIR)/%.so : eggflags/%.flag
-	$(CHICKEN_INSTALL) $(PROX) -keep-installed $(shell basename $*)
-
-$(EGGFLAGS) : # $(CHICKEN_INSTALL)
-	mkdir -p eggflags
-	touch $(EGGFLAGS)
-
-# some setup stuff
-#
-setup-chicken4x.sh : $(EGGFLAGS)
-	(echo "export PATH=$(PATH)" > setup-chicken4x.sh)
-	(echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" >> setup-chicken4x.sh)
-	mkdir -p $(PREFIX)
-
-chicken-core/chicken.scm : chicken-$(CHICKEN_VERSION).tar.gz
-	tar xfz chicken-$(CHICKEN_VERSION).tar.gz
-	ln -sf chicken-$(CHICKEN_VERSION) chicken-core
-
-
-chicken-4.9.0rc1.tar.gz : 
-	wget http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-4.9.0rc1.tar.gz
-
-chicken-4.9.0.1.tar.gz :
-	wget http://code.call-cc.org/releases/4.9.0/chicken-4.9.0.1.tar.gz
-
-# git clone git://code.call-cc.org/chicken-core
-# git clone http://code.call-cc.org/git/chicken-core.git
-
-$(CHICKEN_INSTALL) : chicken-core/chicken.scm setup-chicken4x.sh
-	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX)
-	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX) install
-
-#======================================================================
-# S Q L I T E 3
-#======================================================================
-
-sqlite-autoconf-$(SQLITE3_VERSION).tar.gz :
-	wget  http://www.sqlite.org/2014/sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
-
-sqlite-autoconf-$(SQLITE3_VERSION)/config.log : sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
-	tar xfz  sqlite-autoconf-$(SQLITE3_VERSION).tar.gz
-
-$(PREFIX)/bin/sqlite3 : sqlite-autoconf-$(SQLITE3_VERSION)/config.log
-	cd sqlite-autoconf-$(SQLITE3_VERSION);./configure --prefix=$(PREFIX);make;make install
-
-$(PREFIX)/lib/sqlite3.so : $(PREFIX)/bin/sqlite3
-	CSC_OPTIONS="-I$(PREFIX)/include -L$(PREFIX)/lib" $(CHICKEN_INSTALL) $(PROX) sqlite3
-
-#======================================================================
-# M A T T S   U T I L S
-#======================================================================
-
-opensrc.fossil :
-	fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil
-
-opensrc/histstore/histstore.scm : opensrc.fossil
-	mkdir -p opensrc
-	cd opensrc;fossil open ../opensrc.fossil
-
-opensrc/histstore/hs : opensrc/histstore/histstore.scm chkn eggs $(PREFIX)/lib/sqlite3.so 
-	cd opensrc/histstore;$(PREFIX)/bin/csc histstore.scm -o hs
-
-$(PREFIX)/bin/hs : opensrc/histstore/hs 
-	cp -f opensrc/histstore/hs $(PREFIX)/bin/hs
-
-#======================================================================
-# I U P 
-#======================================================================
-
-ffcall.fossil :
-	fossil clone http://www.kiatoa.com/fossils/ffcall ffcall.fossil
-
-ffcall/README : ffcall.fossil
-	mkdir -p ffcall
-	cd ffcall && if [ -e README ];then fossil update; else fossil open ../ffcall.fossil; fi
-
-# NOTE: This worked fine *without* the enable-shared
-#
-$(PREFIX)/lib/libavcall.a : ffcall/README
-	cd ffcall;./configure --prefix=$(PREFIX) --enable-shared && make && make install
-
-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 $(IUPBRANCH); else fossil open ../iuplib.fossil;fossil update $(IUPBRANCH); fi
-
-iup/alldone : iup/installall.sh $(PREFIX)/include/iup.h $(PREFIX)/lib/libiup.so
-	cd iup && ./makeall.sh
-
-$(PREFIX)/lib/libiup.so $(PREFIX)/include/iup.h : iup/installall.sh iup/alldone
-	cd iup && ./installall.sh
-
-# $(PREFIX)/lib/libiup.so : iup/iup/alldone
-#	touch -c $(PREFIX)/lib/libiup.so
-
-$(CHICKEN_EGG_DIR)/iup.so : $(PREFIX)/lib/libiup.so
-	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CSC_OPTIONS=$(CSC_OPTIONS) $(CHICKEN_INSTALL) $(PROX) -D no-library-checks -feature disable-iup-web iup
-
-$(CHICKEN_EGG_DIR)/canvas-draw.so :  $(PREFIX)/lib/libiup.so
-	CSC_OPTIONS=$(CSC_OPTIONS) $(CHICKEN_INSTALL) $(PROX) -D no-library-checks canvas-draw
-
-
-clean :
-	rm -rf chicken-4.8.0 eggflags ffcall sqlite-autoconf-$(SQLITE3_VERSION)

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -3,12 +3,21 @@
 prefix=$1
 cmd=$2
 target=$3
 
 if [ "$LD_LIBRARY_PATH" != "" ];then
+  cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
   echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
-  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" > $prefix/bin/.$(lsb_release -sr)/cfg.sh
+( cat << __EOF
+if [ "\$LD_LIBRARY_PATH" != "" ];then
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH
+else
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+fi
+__EOF
+) > $cfgfile
+  echo 
 else
   echo "INFO: LD_LIBRARY_PATH not set" >&2
 fi
 
 echo "#!/bin/bash" > $target