<short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-64) unstable; urgency=medium

  * list_order.24

Gbp-Pq: Name list_order.25

diff --git a/makefile b/makefile
index 9d34f5d2a7755c404f630e099d2a76604eac2c6d..409c1969f4d18b37d22274d5853100ea543b143a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -149,7 +149,7 @@ command:
 merge:
        $(CC) -o merge merge.c
 
-LISP_LIB=cmpnew/gcl_collectfn.o cmpnew/gcl_collectfn.lsp xgcl-2/sysdef.lisp xgcl-2/gcl_dwtest.lsp xgcl-2/gcl_dwtestcases.lsp lsp/gcl_gprof.lsp lsp/gcl_info.o lsp/gcl_profile.lsp lsp/gcl_export.lsp lsp/gcl_autoload.lsp cmpnew/gcl_cmpmain.lsp cmpnew/gcl_cmpopt.lsp cmpnew/gcl_lfun_list.lsp lsp/gcl_auto_new.lsp h/cmpinclude.h unixport/init_$(SYSTEM).lsp unixport/lib$(SYSTEM).a unixport/libgclp.a gcl-tk/tk-package.lsp $(TK_LISP_LIB) $(RL_LIB) $(FIRST_FILE) $(LAST_FILE) $(addsuffix /sys-proclaim.lisp,lsp cmpnew pcl clcs) unixport/gcl.script
+LISP_LIB=cmpnew/gcl_collectfn.o cmpnew/gcl_collectfn.lsp xgcl-2/sysdef.lisp xgcl-2/gcl_dwtest.lsp xgcl-2/gcl_dwtestcases.lsp lsp/gcl_gprof.lsp lsp/gcl_info.o lsp/gcl_profile.lsp lsp/gcl_export.lsp lsp/gcl_autoload.lsp cmpnew/gcl_cmpmain.lsp cmpnew/gcl_cmpopt.lsp cmpnew/gcl_lfun_list.lsp lsp/gcl_auto_new.lsp h/cmpinclude.h unixport/sys_init.lsp unixport/lib$(SYSTEM).a unixport/libgclp.a gcl-tk/tk-package.lsp $(TK_LISP_LIB) $(RL_LIB) $(FIRST_FILE) $(LAST_FILE) $(addsuffix /sys-proclaim.lisp,lsp cmpnew pcl clcs) unixport/gcl.script
 
 install-command:
        rm -f $(DESTDIR)$(prefix)/bin/gcl

diff --git a/unixport/makefile b/unixport/makefile
index f4a299866e62a80ffe1875bc765ef68b1877e2a0..1dfee3ce2f3cd61f2d2bf16592e68b418e0e007f 100644 (file)
--- a/unixport/makefile
+++ b/unixport/makefile
@@ -69,13 +69,9 @@ $(LSPDIR)/auto_new.lsp: $(LSPDIR)/auto.lsp
        [ "$(RL_OBJS)" = "" ] || \
                echo "(AUTOLOAD 'init-readline '|readline|)" >>$@
 
-saved_%:raw_% $(RSYM) sys_init.lsp.in raw_%_map msys \
-               $(CMPDIR)/gcl_cmpmain.lsp \
-               $(CMPDIR)/gcl_lfun_list.lsp \
-               $(CMPDIR)/gcl_cmpopt.lsp $(HDIR)/cmpinclude.h \
-               $(LSPDIR)/gcl_auto_new.lsp
+sys_init.lsp: sys_init.lsp.in
 
-       cat sys_init.lsp.in | sed \
+       cat $< | sed \
                -e "s#@LI-VERS@#(`cat ../majvers`.`cat ../minvers`) `cat ../release`#1" \
                -e "s#@LI-EXTVERS@#`cat ../minvers | cut -f2 -d.`#1" \
                -e "s#@LI-MINVERS@#`cat ../minvers | cut -f1 -d.`#1" \
@@ -87,8 +83,16 @@ saved_%:raw_% $(RSYM) sys_init.lsp.in raw_%_map msys \
                -e "s#@LI-LD-LIBS@#\" $(LD_LIBS_POST)\"#1" \
                -e "s#@LI-OPT-THREE@#\"$(O3FLAGS)\"#1" \
                -e "s#@LI-OPT-TWO@#\"$(O2FLAGS)\"#1" \
-               -e "s#@LI-INIT-LSP@#\"$@\"#1" >foo
+               -e "s#@LI-INIT-LSP@#\"$@\"#1" >$@
+
+
+saved_%:raw_% $(RSYM) sys_init.lsp raw_%_map msys \
+               $(CMPDIR)/gcl_cmpmain.lsp \
+               $(CMPDIR)/gcl_lfun_list.lsp \
+               $(CMPDIR)/gcl_cmpopt.lsp $(HDIR)/cmpinclude.h \
+               $(LSPDIR)/gcl_auto_new.lsp
 
+       cp sys_init.lsp foo
        echo "(unless si::*quit-tags* (in-package \"USER\")(system:save-system \"$@\"))" >>foo
        j=$$(ar t lib$*.a |grep ^gcl_);[ "$$j" = "" ] || ar x lib$*.a $$j #accelerator
        $(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/ -libdir $(GCLDIR)/ < foo
@@ -156,7 +160,7 @@ map_%:
 #      $(CC) $(LD_FLAGS) -c -o $@ plt.c $(CFLAGS) -I$(HDIR) -I$(ODIR)
 
 clean:
-       rm -rf  saved_*$(EXE) raw_*$(EXE) *.o core a.out $(RSYM) \
+       rm -rf  saved_*$(EXE) raw_*$(EXE) *.o core a.out $(RSYM) sys_init.lsp \
                $(LSPDIR)/auto_new.lsp foo *maxima* init_*.lsp lib*.a gmp* bfd* *.lsp.tmp \
                gazonk*.lsp plt*h *_map saved_* lib* raw_* msys out* log* tmp* gcl.script