Marijn Schouten (hkBst) wrote:
Anyway, I think I have DESTDIR support mostly done; I just need to do the linking once and set the correct rpath. Though without libtool my modifications will likely only work correctly on GNU-compatible systems.
Marijn
Alright, so I finished hacking on this for now. I have added DESTDIR support, then did the minimum effort changes to the rest of the build logic. I hope this may be useful to someone, or will help start a discussion about the build system. I ran the following commands over the source to do the changes: find -name tests -prune -o -name makefile.in -print | \ xargs sed --in-place -f ${FILESDIR}/add_DESTDIR-to_INSTALL.sed sed -e "s:\(LINK='\$(C_COMPILER)\):\1 -Wl,--rpath -Wl,\$(libdir):" \ -i configure.ac sed -e "s:\(LINK_LIBS\):\1_CL:" -i configure.ac sed -e "s:\(MAKE_LIBRARY_LIBS\):\1_CL:" -i configure.ac then ran autotools. Further it will only work when configured with --enable-shared. The total resulting change I also attached (DESTDIR.patch). Unfortunately a disproportional part of the patch is about disabling "rm -f" in non-uninstall targets (uninstall targets mangled as collateral damage). Marijn -- Marijn Schouten (hkBst), Gentoo Lisp project, Gentoo ML <http://www.gentoo.org/proj/en/lisp/>, #gentoo-{lisp,ml} on FreeNode #INSTALL #s:\$(INSTALL)* #INSTALL_DATA s:\(\$(INSTALL_DATA).*\)\(\$(docdir)\):\1\$(DESTDIR)\2: s:\(\$(INSTALL_DATA).*\)\(\$(infodir)\):\1\$(DESTDIR)\2: s:\(\$(INSTALL_DATA).*\)\(\$(libdir)\):\1\$(DESTDIR)\2: s:\(\$(INSTALL_DATA).*\)\(\$(emacsdir)\):\1\$(DESTDIR)\2: s:\(\$(INSTALL_DATA).*\)\(\$(prefix)\):\1\$(DESTDIR)\2: s:\(\$(INSTALL_DATA).*\)\(\$(includedir)\):\1\$(DESTDIR)\2: #INSTALL_LIB s:\(\$(INSTALL_LIB).*\)\(\$(libdir)\):\1\$(DESTDIR)\2: #INSTALL_PROGRAM s:\(\$(INSTALL_PROGRAM).*\)\(\$(bindir)\):\1\$(DESTDIR)\2: #mkidirs s:\(mkidirs \)\(\$(bindir)\):\1\$(DESTDIR)\2: s:\(mkidirs \)\(\$(docdir) \)\(\$(infodir)\):\1\$(DESTDIR)\2\$(DESTDIR)\3: s:\(mkidirs \)\(\$(libdir)\):\1\$(DESTDIR)\2: s:\(mkidirs \)\(\$(emacsdir)\):\1\$(DESTDIR)\2: s:\(mkidirs \)\(\$(includedir)\):\1\$(DESTDIR)\2: #create symlinks inside DESTDIR s:(cd \(\$(prefix) \&\& \$(LN_S)\):(cd \$(DESTDIR)\1: s:(cd \(\$(bindir) \&\& \$(LN_S)\):(cd \$(DESTDIR)\1: #this will not work for us, because it wants to delete files outside of DESTDIR #it should be moved to an uninstall target, but we don't use those anyway s:rm -f:echo: #these want to do bad stuff after install s:\@MAKE_LIBRARY_FOR_INSTALL\@:echo: s:\@LINK_FOR_INSTALL\@:echo: #these ignore configure paths s:libdir = .*:libdir = @libdir@: #this results in bad path in library /^MAKE_LIBRARY_LIBS = /{p;s:\(MAKE_LIBRARY_LIBS\):\1_CL:;} /^MAKE_LIBRARY_LIBS_CL = /s:\$(GAMBCLIB): -lgambc: /^MAKE_LIBRARY_LIBS_CL = /s:\(\$(rootfromhere)/lib/\): -L\1: #this results in bad path in executable /^LINK_LIBS = /{p;s:\(LINK_LIBS\):\1_CL:;} /^LINK_LIBS_CL = /s:\$(GAMBCLIB): -lgambc: /^LINK_LIBS_CL = /s:\(\$(rootfromhere)/lib/\): -L\1: /^LINK_LIBS_CL = /s:\$(GAMBCGSILIB): -L. -lgambcgsi: /^LINK_LIBS_CL = /s:\$(GAMBCGSCLIB): -L. -lgambcgsc: diff -urd /home/marijn/gambit/gambc-v4_3_2/bin/makefile.in ./bin/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/bin/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./bin/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -65,7 +65,7 @@ all-post: gsc-cc-o.bat six@exe@ gsi-script@bat@ gsc-script@bat@ six-script@bat@ scheme-srfi-0@bat@ scheme-r5rs@bat@ scheme-r4rs@bat@ scheme-ieee-1178-1990@bat@ gsc-cc-o.bat: makefile - rm -f gsc-cc-o.bat + echo gsc-cc-o.bat if test "@bat@" = ""; then \ echo "#! /bin/sh" > gsc-cc-o.bat; \ echo "" >> gsc-cc-o.bat; \ @@ -140,7 +140,7 @@ fi six@exe@: makefile - rm -f six@exe@ six@exe@.lnk + echo six@exe@ six@exe@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ six@exe@; \ else \ @@ -148,7 +148,7 @@ fi gsi-script@bat@: makefile - rm -f gsi-script@bat@ gsi-script@bat@.lnk + echo gsi-script@bat@ gsi-script@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ gsi-script@bat@; \ else \ @@ -156,7 +156,7 @@ fi gsc-script@bat@: makefile - rm -f gsc-script@bat@ gsc-script@bat@.lnk + echo gsc-script@bat@ gsc-script@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsc/gsc@exe@ gsc-script@bat@; \ else \ @@ -164,7 +164,7 @@ fi six-script@bat@: makefile - rm -f six-script@bat@ six-script@bat@.lnk + echo six-script@bat@ six-script@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ six-script@bat@; \ else \ @@ -172,7 +172,7 @@ fi scheme-srfi-0@bat@: makefile - rm -f scheme-srfi-0@bat@ scheme-srfi-0@bat@.lnk + echo scheme-srfi-0@bat@ scheme-srfi-0@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ scheme-srfi-0@bat@; \ else \ @@ -180,7 +180,7 @@ fi scheme-r5rs@bat@: makefile - rm -f scheme-r5rs@bat@ scheme-r5rs@bat@.lnk + echo scheme-r5rs@bat@ scheme-r5rs@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ scheme-r5rs@bat@; \ else \ @@ -188,7 +188,7 @@ fi scheme-r4rs@bat@: makefile - rm -f scheme-r4rs@bat@ scheme-r4rs@bat@.lnk + echo scheme-r4rs@bat@ scheme-r4rs@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ scheme-r4rs@bat@; \ else \ @@ -196,7 +196,7 @@ fi scheme-ieee-1178-1990@bat@: makefile - rm -f scheme-ieee-1178-1990@bat@ scheme-ieee-1178-1990@bat@.lnk + echo scheme-ieee-1178-1990@bat@ scheme-ieee-1178-1990@bat@.lnk if test "@bat@" = ""; then \ $(LN_S) $(rootfromhere)/gsi/gsi@exe@ scheme-ieee-1178-1990@bat@; \ else \ @@ -206,8 +206,8 @@ install-pre: install-post: all - $(srcdirpfx)$(rootfromhere)/mkidirs $(bindir) - rm -f $(bindir)/gsc-cc-o.bat \ + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(bindir) + echo $(bindir)/gsc-cc-o.bat \ $(bindir)/six@exe@ $(bindir)/six@exe@.lnk \ $(bindir)/gsi-script@bat@ $(bindir)/gsi-script@bat@.lnk \ $(bindir)/gsc-script@bat@ $(bindir)/gsc-script@bat@.lnk \ @@ -216,31 +216,31 @@ $(bindir)/scheme-r5rs@bat@ $(bindir)/scheme-r5rs@bat@.lnk \ $(bindir)/scheme-r4rs@bat@ $(bindir)/scheme-r4rs@bat@.lnk \ $(bindir)/scheme-ieee-1178-1990@bat@ $(bindir)/scheme-ieee-1178-1990@bat@.lnk - $(INSTALL_PROGRAM) gsc-cc-o.bat $(bindir)/gsc-cc-o.bat + $(INSTALL_PROGRAM) gsc-cc-o.bat $(DESTDIR)$(bindir)/gsc-cc-o.bat if test "@bat@" = ""; then \ - (cd $(bindir) && $(LN_S) gsi@exe@ six@exe@); \ - (cd $(bindir) && $(LN_S) gsi@exe@ gsi-script@bat@); \ - (cd $(bindir) && $(LN_S) gsc@exe@ gsc-script@bat@); \ - (cd $(bindir) && $(LN_S) gsi@exe@ six-script@bat@); \ - (cd $(bindir) && $(LN_S) gsi@exe@ scheme-srfi-0@bat@); \ - (cd $(bindir) && $(LN_S) gsi@exe@ scheme-r5rs@bat@); \ - (cd $(bindir) && $(LN_S) gsi@exe@ scheme-r4rs@bat@); \ - (cd $(bindir) && $(LN_S) gsi@exe@ scheme-ieee-1178-1990@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ six@exe@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ gsi-script@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsc@exe@ gsc-script@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ six-script@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ scheme-srfi-0@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ scheme-r5rs@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ scheme-r4rs@bat@); \ + (cd $(DESTDIR)$(bindir) && $(LN_S) gsi@exe@ scheme-ieee-1178-1990@bat@); \ else \ - $(INSTALL_PROGRAM) six@exe@ $(bindir)/six@exe@; \ - $(INSTALL_PROGRAM) gsi-script@bat@ $(bindir)/gsi-script@bat@; \ - $(INSTALL_PROGRAM) gsc-script@bat@ $(bindir)/gsc-script@bat@; \ - $(INSTALL_PROGRAM) six-script@bat@ $(bindir)/six-script@bat@; \ - $(INSTALL_PROGRAM) scheme-srfi-0@bat@ $(bindir)/scheme-srfi-0@bat@; \ - $(INSTALL_PROGRAM) scheme-r5rs@bat@ $(bindir)/scheme-r5rs@bat@; \ - $(INSTALL_PROGRAM) scheme-r4rs@bat@ $(bindir)/scheme-r4rs@bat@; \ - $(INSTALL_PROGRAM) scheme-ieee-1178-1990@bat@ $(bindir)/scheme-ieee-1178-1990@bat@; \ + $(INSTALL_PROGRAM) six@exe@ $(DESTDIR)$(bindir)/six@exe@; \ + $(INSTALL_PROGRAM) gsi-script@bat@ $(DESTDIR)$(bindir)/gsi-script@bat@; \ + $(INSTALL_PROGRAM) gsc-script@bat@ $(DESTDIR)$(bindir)/gsc-script@bat@; \ + $(INSTALL_PROGRAM) six-script@bat@ $(DESTDIR)$(bindir)/six-script@bat@; \ + $(INSTALL_PROGRAM) scheme-srfi-0@bat@ $(DESTDIR)$(bindir)/scheme-srfi-0@bat@; \ + $(INSTALL_PROGRAM) scheme-r5rs@bat@ $(DESTDIR)$(bindir)/scheme-r5rs@bat@; \ + $(INSTALL_PROGRAM) scheme-r4rs@bat@ $(DESTDIR)$(bindir)/scheme-r4rs@bat@; \ + $(INSTALL_PROGRAM) scheme-ieee-1178-1990@bat@ $(DESTDIR)$(bindir)/scheme-ieee-1178-1990@bat@; \ fi uninstall-pre: uninstall-post: - rm -f $(bindir)/gsc-cc-o.bat \ + echo $(bindir)/gsc-cc-o.bat \ $(bindir)/six@exe@ $(bindir)/six@exe@.lnk \ $(bindir)/gsi-script@bat@ $(bindir)/gsi-script@bat@.lnk \ $(bindir)/gsc-script@bat@ $(bindir)/gsc-script@bat@.lnk \ @@ -253,7 +253,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f gsc-cc-o.bat \ + echo gsc-cc-o.bat \ six@exe@ six@exe@.lnk \ gsi-script@bat@ gsi-script@bat@.lnk \ gsc-script@bat@ gsc-script@bat@.lnk \ @@ -270,7 +270,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/configure.ac ./configure.ac --- /home/marijn/gambit/gambc-v4_3_2/configure.ac 2008-11-27 15:27:55.000000000 +0100 +++ ./configure.ac 2008-12-01 22:32:22.000000000 +0100 @@ -1205,10 +1205,10 @@ ;; esac - MAKE_LIBRARY='$(C_COMPILER) $(FLAGS_LIB) -o $(LIBRARY) $(LIBRARY_OBJECTS) $(MAKE_LIBRARY_LIBS) $(LIBS)' + MAKE_LIBRARY='$(C_COMPILER) $(FLAGS_LIB) -o $(LIBRARY) $(LIBRARY_OBJECTS) $(MAKE_LIBRARY_LIBS_CL) $(LIBS)' MAKE_LIBRARY_FOR_INSTALL='$(C_COMPILER) $(FLAGS_LIB) -o $(LIBRARY) $(LIBRARY_OBJECTS) $(MAKE_LIBRARY_FOR_INSTALL_LIBS) $(LIBS)' FIXLIB='#' - LINK='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS) $(LIBS) -o $(EXECUTABLE)' + LINK='$(C_COMPILER) -Wl,--rpath -Wl,$(libdir) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS_CL) $(LIBS) -o $(EXECUTABLE)' LINK_FOR_INSTALL='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_FOR_INSTALL_LIBS) $(LIBS) -o $(EXECUTABLE)' else @@ -1225,7 +1225,7 @@ MAKE_LIBRARY='lib -out:$(LIBRARY) $(LIBRARY_OBJECTS)' MAKE_LIBRARY_FOR_INSTALL=':' FIXLIB=':' - LINK='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS) $(LIBS) -Fe$(EXECUTABLE)' + LINK='$(C_COMPILER) -Wl,--rpath -Wl,$(libdir) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS_CL) $(LIBS) -Fe$(EXECUTABLE)' LINK_FOR_INSTALL=':' # else if test "$C_COMP_WATCOMC" = yes; then @@ -1241,7 +1241,7 @@ MAKE_LIBRARY='ar rc $(LIBRARY) $(LIBRARY_OBJECTS) && $(RANLIB) $(LIBRARY)' MAKE_LIBRARY_FOR_INSTALL=':' FIXLIB='$(RANLIB)' - LINK='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS) $(LIBS) -o $(EXECUTABLE)' + LINK='$(C_COMPILER) -Wl,--rpath -Wl,$(libdir) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS_CL) $(LIBS) -o $(EXECUTABLE)' LINK_FOR_INSTALL=':' fi diff -urd /home/marijn/gambit/gambc-v4_3_2/doc/makefile.in ./doc/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/doc/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./doc/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -116,12 +116,12 @@ echo "@set EDITION $(PACKAGE_VERSION)" > version.tmp; \ echo "@set UPDATED $$mtime" >> version.tmp; \ echo "@set VERSION $(PACKAGE_VERSION)" >> version.tmp - if cmp -s version.tmp $(srcdirpfx)version.txi; then rm -f version.tmp; \ + if cmp -s version.tmp $(srcdirpfx)version.txi; then echo version.tmp; \ else mv version.tmp $(srcdirpfx)version.txi; fi date > $(srcdirpfx)stamp.vti checkdoc: - rm -f *.o[0123456789]* fifo + echo *.o[0123456789]* fifo rm -rf newdir @SETDLPATH@ $(rootfromhere)/gsi/gsi checkdoc.scm diff gambit-c.txi gambit-c.txi-correct @@ -129,24 +129,24 @@ install-pre: install-post: all doc - $(srcdirpfx)$(rootfromhere)/mkidirs $(docdir) $(infodir) - $(INSTALL_DATA) gambit-c.pdf $(docdir)/gambit-c.pdf - $(INSTALL_DATA) gambit-c.txt $(docdir)/gambit-c.txt - $(INSTALL_DATA) gambit-c.html $(docdir)/gambit-c.html + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(docdir) $(DESTDIR)$(infodir) + $(INSTALL_DATA) gambit-c.pdf $(DESTDIR)$(docdir)/gambit-c.pdf + $(INSTALL_DATA) gambit-c.txt $(DESTDIR)$(docdir)/gambit-c.txt + $(INSTALL_DATA) gambit-c.html $(DESTDIR)$(docdir)/gambit-c.html cd $(srcdir) && for file in gambit-c.info*; do \ - $(INSTALL_DATA) $$file $(infodir)/$$file; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \ done uninstall-pre: uninstall-post: - rm -f $(infodir)/gambit-c.info* + echo $(infodir)/gambit-c.info* mostlyclean-pre: mostlyclean-post: - rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr - rm -f *.tmp + echo *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr + echo *.tmp clean-pre: mostlyclean-pre @@ -155,12 +155,12 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre realclean-post: distclean-post - rm -f stamp.vti version.txi gambit-c.info* gambit-c.pdf gambit-c.txt gambit-c.txt + echo stamp.vti version.txi gambit-c.info* gambit-c.pdf gambit-c.txt gambit-c.txt rc-setup-pre: $(RC) add $(RCFILES) diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/distr-comp/makefile.in ./examples/distr-comp/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/distr-comp/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/distr-comp/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ examples: distr-comp.o1 dc.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) $(srcdirpfx)$*.scm run: @@ -84,7 +84,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f distr-comp.c distr-comp@obj@ distr-comp.o1 dc.c dc@obj@ dc.o1 + echo distr-comp.c distr-comp@obj@ distr-comp.o1 dc.c dc@obj@ dc.o1 clean-pre: mostlyclean-pre @@ -93,7 +93,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/makefile.in ./examples/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -94,7 +94,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/misc/makefile.in ./examples/misc/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/misc/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/misc/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ examples: signals .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) $(srcdirpfx)$*.scm signals: signals.o1 @@ -84,7 +84,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f pi.c pi@obj@ pi.o1 + echo pi.c pi@obj@ pi.o1 clean-pre: mostlyclean-pre @@ -93,7 +93,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/pi/makefile.in ./examples/pi/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/pi/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/pi/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ examples: pi.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) $(srcdirpfx)$*.scm run: @@ -84,7 +84,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f pi.c pi@obj@ pi.o1 + echo pi.c pi@obj@ pi.o1 clean-pre: mostlyclean-pre @@ -93,7 +93,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/pthread/makefile.in ./examples/pthread/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/pthread/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/pthread/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -103,7 +103,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f mylib.c mylib_.c mylib@obj@ mylib_@obj@ pthread@obj@ pthread@exe@ + echo mylib.c mylib_.c mylib@obj@ mylib_@obj@ pthread@obj@ pthread@exe@ clean-pre: mostlyclean-pre @@ -112,7 +112,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/ring/makefile.in ./examples/ring/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/ring/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/ring/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ examples: ring.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) $(srcdirpfx)$*.scm run: @@ -84,7 +84,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f ring.c ring@obj@ ring.o1 + echo ring.c ring@obj@ ring.o1 clean-pre: mostlyclean-pre @@ -93,7 +93,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/tcltk/makefile.in ./examples/tcltk/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/tcltk/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/tcltk/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -70,7 +70,7 @@ examples: test.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) -cc-options "@X_CFLAGS@" -ld-options "@X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -ltcl -ltk -lX11" $(srcdirpfx)$*.scm run: tcltk.o1 @@ -87,7 +87,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f tcltk.c tcltk@obj@ tcltk.o1 test.c test@obj@ test.o1 + echo tcltk.c tcltk@obj@ tcltk.o1 test.c test@obj@ test.o1 clean-pre: mostlyclean-pre @@ -96,7 +96,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/web-repl/makefile.in ./examples/web-repl/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/web-repl/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/web-repl/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ examples: web-repl.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) $(srcdirpfx)$*.scm run: @@ -86,7 +86,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f web-repl.c web-repl@obj@ web-repl.o1 + echo web-repl.c web-repl@obj@ web-repl.o1 clean-pre: mostlyclean-pre @@ -95,7 +95,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/web-server/makefile.in ./examples/web-server/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/web-server/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/web-server/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -68,7 +68,7 @@ examples: web-server.o1 http.o1 html.o1 base64.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) $(srcdirpfx)$*.scm run: @@ -85,7 +85,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f web-server.c web-server@obj@ web-server.o1 http.c http@obj@ http.o1 html.c html@obj@ html.o1 base64.c base64@obj@ base64.o1 + echo web-server.c web-server@obj@ web-server.o1 http.c http@obj@ http.o1 html.c html@obj@ html.o1 base64.c base64@obj@ base64.o1 clean-pre: mostlyclean-pre @@ -94,7 +94,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/examples/Xlib-simple/makefile.in ./examples/Xlib-simple/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/examples/Xlib-simple/makefile.in 2008-11-27 13:20:02.000000000 +0100 +++ ./examples/Xlib-simple/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ examples: bounce.o1 run .scm.o1: - rm -f $*.o* + echo $*.o* @SETDLPATH@ $(rootfromhere)/gsc/gsc -:=$(srcdirpfx)$(rootfromhere) -cc-options "@X_CFLAGS@" -ld-options "@X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11" $(srcdirpfx)$*.scm run: Xlib.o1 @@ -84,7 +84,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f Xlib.c Xlib@obj@ Xlib.o1 bounce.c bounce@obj@ bounce.o1 + echo Xlib.c Xlib@obj@ Xlib.o1 bounce.c bounce@obj@ bounce.o1 clean-pre: mostlyclean-pre @@ -93,7 +93,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/gsc/makefile.in ./gsc/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/gsc/makefile.in 2008-11-27 13:20:03.000000000 +0100 +++ ./gsc/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -45,7 +45,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -98,6 +98,7 @@ $(LIBRARY_NORMAL_O_IN_COMPILE_ORDER) _gambcgsc@obj@ MAKE_LIBRARY_LIBS = $(rootfromhere)/lib/$(GAMBCLIB) +MAKE_LIBRARY_LIBS_CL = -L$(rootfromhere)/lib/ -lgambc MAKE_LIBRARY_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCLIB) EXECUTABLE = gsc@exe@ @@ -126,6 +127,7 @@ $(EXECUTABLE_NORMAL_O_IN_COMPILE_ORDER) _gsc_@obj@ LINK_LIBS = $(GAMBCGSCLIB) $(rootfromhere)/lib/$(GAMBCLIB) +LINK_LIBS_CL = -L. -lgambcgsc -L$(rootfromhere)/lib/ -lgambc LINK_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCGSCLIB) $(libdir)/$(GAMBCLIB) MODULES_SCM = $(LIBRARY_MODULES_SCM) $(EXECUTABLE_MODULES_SCM) @@ -146,7 +148,7 @@ all-post: $(LIBRARY) $(EXECUTABLE) $(LIBRARY): $(LIBRARY_OBJECTS_IN_COMPILE_ORDER) - rm -f $(LIBRARY) + echo $(LIBRARY) @MAKE_LIBRARY@ _gambcgsc.c: $(LIBRARY_MODULES_C) $(rootfromhere)/lib/_gambc.c @@ -182,41 +184,41 @@ install-pre: install-post: all - $(srcdirpfx)$(rootfromhere)/mkidirs $(bindir) - $(INSTALL_DATA) $(srcdirpfx)_gambcgsc.c $(libdir)/_gambcgsc.c - @MAKE_LIBRARY_FOR_INSTALL@ - $(INSTALL_LIB) $(LIBRARY) $(libdir)/$(LIBRARY) + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(bindir) + $(INSTALL_DATA) $(srcdirpfx)_gambcgsc.c $(DESTDIR)$(libdir)/_gambcgsc.c + echo + $(INSTALL_LIB) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) @FIXLIB@ $(libdir)/$(LIBRARY) #for library in $(LIBRARIES_SCM); do \ - # $(INSTALL_DATA) $$library $(libdir)/$$library; \ + # $(INSTALL_DATA) $$library $(DESTDIR)$(libdir)/$$library; \ #done - @LINK_FOR_INSTALL@ - $(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir)/$(EXECUTABLE) + echo + $(INSTALL_PROGRAM) $(EXECUTABLE) $(DESTDIR)$(bindir)/$(EXECUTABLE) uninstall-pre: uninstall-post: - rm -f $(bindir)/$(EXECUTABLE) + echo $(bindir)/$(EXECUTABLE) mostlyclean-pre: mostlyclean-post: - rm -f $(OBJECTS) $(GAMBCGSCLIB) + echo $(OBJECTS) $(GAMBCGSCLIB) clean-pre: mostlyclean-pre clean-post: mostlyclean-post - rm -f $(MODULES_C) _gambcgsc.c _gsc_.c *.da *.bb *.bbg *.gcov + echo $(MODULES_C) _gambcgsc.c _gsc_.c *.da *.bb *.bbg *.gcov distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre realclean-post: distclean-post - rm -f $(EXECUTABLE) + echo $(EXECUTABLE) rc-setup-pre: $(RC) add $(RCFILES) diff -urd /home/marijn/gambit/gambc-v4_3_2/gsi/makefile.in ./gsi/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/gsi/makefile.in 2008-11-27 13:20:03.000000000 +0100 +++ ./gsi/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -45,7 +45,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -84,6 +84,7 @@ $(LIBRARY_NORMAL_O_IN_COMPILE_ORDER) _gambcgsi@obj@ MAKE_LIBRARY_LIBS = $(rootfromhere)/lib/$(GAMBCLIB) +MAKE_LIBRARY_LIBS_CL = -L$(rootfromhere)/lib/ -lgambc MAKE_LIBRARY_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCLIB) EXECUTABLE = gsi@exe@ @@ -112,6 +113,7 @@ $(EXECUTABLE_NORMAL_O_IN_COMPILE_ORDER) _gsi_@obj@ LINK_LIBS = $(GAMBCGSILIB) $(rootfromhere)/lib/$(GAMBCLIB) +LINK_LIBS_CL = -L. -lgambcgsi -L$(rootfromhere)/lib/ -lgambc LINK_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCGSILIB) $(libdir)/$(GAMBCLIB) MODULES_SCM = $(LIBRARY_MODULES_SCM) $(EXECUTABLE_MODULES_SCM) @@ -131,7 +133,7 @@ all-post: $(LIBRARY) $(EXECUTABLE) $(LIBRARY): $(LIBRARY_OBJECTS_IN_COMPILE_ORDER) - rm -f $(LIBRARY) + echo $(LIBRARY) @MAKE_LIBRARY@ _gambcgsi.c: $(LIBRARY_MODULES_C) $(rootfromhere)/lib/_gambc.c @@ -166,41 +168,41 @@ install-pre: install-post: all - $(srcdirpfx)$(rootfromhere)/mkidirs $(bindir) - $(INSTALL_DATA) $(srcdirpfx)_gambcgsi.c $(libdir)/_gambcgsi.c - @MAKE_LIBRARY_FOR_INSTALL@ - $(INSTALL_LIB) $(LIBRARY) $(libdir)/$(LIBRARY) + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(bindir) + $(INSTALL_DATA) $(srcdirpfx)_gambcgsi.c $(DESTDIR)$(libdir)/_gambcgsi.c + echo + $(INSTALL_LIB) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) @FIXLIB@ $(libdir)/$(LIBRARY) #for library in $(LIBRARIES_SCM); do \ - # $(INSTALL_DATA) $$library $(libdir)/$$library; \ + # $(INSTALL_DATA) $$library $(DESTDIR)$(libdir)/$$library; \ #done - @LINK_FOR_INSTALL@ - $(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir)/$(EXECUTABLE) + echo + $(INSTALL_PROGRAM) $(EXECUTABLE) $(DESTDIR)$(bindir)/$(EXECUTABLE) uninstall-pre: uninstall-post: - rm -f $(bindir)/$(EXECUTABLE) + echo $(bindir)/$(EXECUTABLE) mostlyclean-pre: mostlyclean-post: - rm -f $(OBJECTS) $(GAMBCGSILIB) + echo $(OBJECTS) $(GAMBCGSILIB) clean-pre: mostlyclean-pre clean-post: mostlyclean-post - rm -f $(MODULES_C) _gambcgsi.c _gsi_.c *.da *.bb *.bbg *.gcov + echo $(MODULES_C) _gambcgsi.c _gsi_.c *.da *.bb *.bbg *.gcov distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre realclean-post: distclean-post - rm -f $(EXECUTABLE) + echo $(EXECUTABLE) rc-setup-pre: $(RC) add $(RCFILES) diff -urd /home/marijn/gambit/gambc-v4_3_2/include/makefile.in ./include/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/include/makefile.in 2008-11-27 13:20:03.000000000 +0100 +++ ./include/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -77,13 +77,13 @@ install-pre: install-post: all - $(srcdirpfx)$(rootfromhere)/mkidirs $(includedir) - $(INSTALL_DATA) $(srcdirpfx)gambit.h $(includedir)/gambit.h + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdirpfx)gambit.h $(DESTDIR)$(includedir)/gambit.h major=`echo $(PACKAGE_VERSION) | sed -e"s&v\([^.]*\)\.\([^.]*\)\.\([^.]*\).*&\1&"`; \ minor=`echo $(PACKAGE_VERSION) | sed -e"s&v\([^.]*\)\.\([^.]*\)\.\([^.]*\).*&\2&"`; \ revision=`echo $(PACKAGE_VERSION) | sed -e"s&v\([^.]*\)\.\([^.]*\)\.\([^.]*\).*&\3&"`; \ version_num=`eval expr "\( 100000 \\* $$major \) + \( 1000 \\* $$minor \) + $$revision"`; \ - $(INSTALL_DATA) $(srcdirpfx)gambit-not$$version_num.h $(includedir)/gambit-not$$version_num.h + $(INSTALL_DATA) $(srcdirpfx)gambit-not$$version_num.h $(DESTDIR)$(includedir)/gambit-not$$version_num.h uninstall-pre: @@ -92,7 +92,7 @@ minor=`echo $(PACKAGE_VERSION) | sed -e"s&v\([^.]*\)\.\([^.]*\)\.\([^.]*\).*&\2&"`; \ revision=`echo $(PACKAGE_VERSION) | sed -e"s&v\([^.]*\)\.\([^.]*\)\.\([^.]*\).*&\3&"`; \ version_num=`eval expr "\( 100000 \\* $$major \) + \( 1000 \\* $$minor \) + $$revision"`; \ - rm -f $(includedir)/gambit.h $(includedir)/gambit-not$$version_num.h + echo $(includedir)/gambit.h $(includedir)/gambit-not$$version_num.h mostlyclean-pre: @@ -105,7 +105,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre @@ -160,7 +160,7 @@ dist-devel: dist-devel-pre dist-devel-recursive dist-devel-post stamp: - rm -f stamp2.h + echo stamp2.h eval `date -u '+stamp_ymd=%Y%m%d stamp_hms=%H%M%S'`; \ sed -e "s/#define ___STAMP_YMD [0-9][0-9]*/#define ___STAMP_YMD `expr $$stamp_ymd`/" -e "s/#define ___STAMP_HMS [0-9][0-9]*/#define ___STAMP_HMS `expr $$stamp_hms`/" stamp.h > stamp2.h mv stamp2.h stamp.h diff -urd /home/marijn/gambit/gambc-v4_3_2/lib/guide/images/makefile.in ./lib/guide/images/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/lib/guide/images/makefile.in 2008-11-27 13:20:03.000000000 +0100 +++ ./lib/guide/images/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info diff -urd /home/marijn/gambit/gambc-v4_3_2/lib/guide/makefile.in ./lib/guide/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/lib/guide/makefile.in 2008-11-27 13:20:03.000000000 +0100 +++ ./lib/guide/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -112,22 +112,22 @@ mostlyclean-pre: mostlyclean-post: - rm -f $(OBJECTS) + echo $(OBJECTS) clean-pre: mostlyclean-pre clean-post: mostlyclean-post - rm -f *.da *.bb *.bbg *.gcov + echo *.da *.bb *.bbg *.gcov distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile guidemak guidepro + echo makefile guidemak guidepro realclean-pre: distclean-pre realclean-post: distclean-post - rm -f $(MODULES_C) + echo $(MODULES_C) rc-setup-pre: $(RC) add $(RCFILES) diff -urd /home/marijn/gambit/gambc-v4_3_2/lib/makefile.in ./lib/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/lib/makefile.in 2008-11-27 13:20:03.000000000 +0100 +++ ./lib/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -117,7 +117,7 @@ all-post: $(LIBRARY) _gambc.c $(LIBRARY): $(LIBRARY_OBJECTS_IN_COMPILE_ORDER) - rm -f $(LIBRARY) + echo $(LIBRARY) @MAKE_LIBRARY@ _gambc.c: $(MODULES_C) @@ -169,37 +169,37 @@ install-pre: install-post: all - $(srcdirpfx)$(rootfromhere)/mkidirs $(libdir) - $(INSTALL_DATA) $(srcdirpfx)_gambc.c $(libdir)/_gambc.c - $(INSTALL_LIB) $(LIBRARY) $(libdir)/$(LIBRARY) + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(libdir) + $(INSTALL_DATA) $(srcdirpfx)_gambc.c $(DESTDIR)$(libdir)/_gambc.c + $(INSTALL_LIB) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) @FIXLIB@ $(libdir)/$(LIBRARY) for library in $(LIBRARIES_SCM); do \ - $(INSTALL_DATA) $$library $(libdir)/$$library; \ + $(INSTALL_DATA) $$library $(DESTDIR)$(libdir)/$$library; \ done uninstall-pre: uninstall-post: - rm -f $(libdir)/_gambc.c - rm -f $(libdir)/$(LIBRARY) + echo $(libdir)/_gambc.c + echo $(libdir)/$(LIBRARY) @for library in $(LIBRARIES_SCM); do \ - rm -f $(libdir)/$$library; \ + echo $(libdir)/$$library; \ done mostlyclean-pre: mostlyclean-post: - rm -f $(OBJECTS) + echo $(OBJECTS) clean-pre: mostlyclean-pre clean-post: mostlyclean-post - rm -f $(MODULES_C) $(LIBRARY) _gambc.c *.da *.bb *.bbg *.gcov + echo $(MODULES_C) $(LIBRARY) _gambc.c *.da *.bb *.bbg *.gcov distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/makefile.in ./makefile.in --- /home/marijn/gambit/gambc-v4_3_2/makefile.in 2008-11-27 13:20:04.000000000 +0100 +++ ./makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -40,7 +40,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -212,7 +212,7 @@ $(MAKE) all $(MAKE) check $(MAKE) doc - rm -f $(PACKAGE_TARNAME).tgz $(PACKAGE_TARNAME)-*.* + echo $(PACKAGE_TARNAME).tgz $(PACKAGE_TARNAME)-*.* $(MAKE) prebuilt publish-release: fake_target @@ -221,15 +221,15 @@ install-pre: install-post: all - rm -f $(prefix)/current $(prefix)/current.lnk + echo $(prefix)/current $(prefix)/current.lnk if test "@bat@" = ""; then \ - (cd $(prefix) && $(LN_S) .$(PACKAGE_SUBDIR) current); \ + (cd $(DESTDIR)$(prefix) && $(LN_S) .$(PACKAGE_SUBDIR) current); \ fi uninstall-pre: uninstall-post: - rm -f $(prefix)/current $(prefix)/current.lnk + echo $(prefix)/current $(prefix)/current.lnk mostlyclean-pre: @@ -242,7 +242,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile config.cache config.h config.log config.status + echo makefile config.cache config.h config.log config.status realclean-pre: distclean-pre @@ -252,7 +252,7 @@ $(RC) init @if test "$(RC)" = "$(GIT)"; then \ $(GIT) add $(RCFILES) $(GITRCFILES); \ - rm -f .git/config; \ + echo .git/config; \ echo '[core]' >> .git/config; \ echo ' repositoryformatversion = 0' >> .git/config; \ echo ' fileMode = false' >> .git/config; \ @@ -268,7 +268,7 @@ echo ' merge = refs/heads/master' >> .git/config; \ else \ $(HG) add $(RCFILES) $(HGRCFILES); \ - rm -f .hg/hgrc; \ + echo .hg/hgrc; \ echo "[paths]" > .hg/hgrc; \ echo "default-push = ssh://gambit@public-gambit-repo/HTML/repo/gambit" >> .hg/hgrc; \ echo "default = http://www.iro.umontreal.ca/~gambit/repo/gambit/" >> .hg/hgrc; \ diff -urd /home/marijn/gambit/gambc-v4_3_2/misc/makefile.in ./misc/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/misc/makefile.in 2008-11-27 13:20:04.000000000 +0100 +++ ./misc/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -81,15 +81,15 @@ install-pre: install-post: all - $(srcdirpfx)$(rootfromhere)/mkidirs $(emacsdir) - $(INSTALL_DATA) gambit.el $(emacsdir)/gambit.el - $(INSTALL_DATA) syntax-case.scm $(prefix)$(PACKAGE_SUBDIR)/syntax-case.scm + $(srcdirpfx)$(rootfromhere)/mkidirs $(DESTDIR)$(emacsdir) + $(INSTALL_DATA) gambit.el $(DESTDIR)$(emacsdir)/gambit.el + $(INSTALL_DATA) syntax-case.scm $(DESTDIR)$(prefix)$(PACKAGE_SUBDIR)/syntax-case.scm uninstall-pre: uninstall-post: - rm -f $(emacsdir)/gambit.el - rm -f $(prefix)$(PACKAGE_SUBDIR)/syntax-case.scm + echo $(emacsdir)/gambit.el + echo $(prefix)$(PACKAGE_SUBDIR)/syntax-case.scm mostlyclean-pre: @@ -102,7 +102,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/prebuilt/macosx/makefile.in ./prebuilt/macosx/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/prebuilt/macosx/makefile.in 2008-11-27 13:20:04.000000000 +0100 +++ ./prebuilt/macosx/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -86,7 +86,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile build-phase2.out + echo makefile build-phase2.out realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/prebuilt/makefile.in ./prebuilt/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/prebuilt/makefile.in 2008-11-27 13:20:04.000000000 +0100 +++ ./prebuilt/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -67,7 +67,7 @@ prebuilt: @for subdir in $(SUBDIRS); do \ echo "************ $$subdir BUILD STARTING"; \ - rm -f remote-script remote-script.out; \ + echo remote-script remote-script.out; \ echo "#! /bin/sh" > remote-script; \ echo "cd /tmp" >> remote-script; \ echo "sudo rm -rf $(PACKAGE_TARNAME).tgz $(PACKAGE_TARNAME)" >> remote-script; \ @@ -78,10 +78,10 @@ echo "scp $(PACKAGE_TARNAME)* \$$ORIGINATOR:$(PWD)/$(rootfromhere)" >> remote-script; \ echo "sudo rm -rf $(PACKAGE_TARNAME).tgz $(PACKAGE_TARNAME)" >> remote-script; \ if ./$$subdir/remote-shell remote-script > remote-script.out && cat remote-script.out && fgrep "************ $$subdir BUILD SUCCESSFUL" remote-script.out > /dev/null; then \ - rm -f remote-script remote-script.out; \ + echo remote-script remote-script.out; \ else \ echo "************ $$subdir BUILD FAILED"; \ - rm -f remote-script remote-script.out; \ + echo remote-script remote-script.out; \ exit 1; \ fi; \ done @@ -97,7 +97,7 @@ mostlyclean-pre: mostlyclean-post: - rm -f remote-script remote-script.out + echo remote-script remote-script.out clean-pre: mostlyclean-pre @@ -106,7 +106,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile + echo makefile realclean-pre: distclean-pre diff -urd /home/marijn/gambit/gambc-v4_3_2/prebuilt/windows/makefile.in ./prebuilt/windows/makefile.in --- /home/marijn/gambit/gambc-v4_3_2/prebuilt/windows/makefile.in 2008-11-27 13:20:04.000000000 +0100 +++ ./prebuilt/windows/makefile.in 2008-12-01 22:32:22.000000000 +0100 @@ -44,7 +44,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = $(prefix)$(PACKAGE_SUBDIR)/include -libdir = $(prefix)$(PACKAGE_SUBDIR)/lib +libdir = @libdir@ bindir = $(prefix)$(PACKAGE_SUBDIR)/bin docdir = $(prefix)$(PACKAGE_SUBDIR)/doc infodir = $(prefix)$(PACKAGE_SUBDIR)/info @@ -85,7 +85,7 @@ distclean-pre: clean-pre distclean-post: clean-post - rm -f makefile build-phase2.out + echo makefile build-phase2.out realclean-pre: distclean-pre