--- gforth/Makefile.in 2008/07/12 20:14:26 1.402 +++ gforth/Makefile.in 2008/07/13 23:44:25 1.405 @@ -129,7 +129,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ #read-only architecture-dependent non-ascii files libdir = @libdir@ -libccdir = $libdir/gforth/$(VERSION)/libcc-named/ +libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/ includedir = @includedir@ infodir = @infodir@ htmldir = @htmldir@ @@ -400,7 +400,7 @@ ENGINE_SOURCES = engine/Makefile.in engi SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - stamp-h.in envos.fs.in \ + stamp-h.in envos.fs.in libcc.fs.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ BUILD-FROM-SCRATCH model \ COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ @@ -616,11 +616,11 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) fi -$(RM) gforth.fi GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) - for i in $(LIBCC_SRC); do gforth -e "s\" $(DESTDIR)$(libccdir)\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION) + for i in $(LIBCC_SRC); do $(DESTDIR)$(bindir)/gforth -e "s\" $(DESTDIR)$(libccdir)\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done $(POST_INSTALL) $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info @@ -647,7 +647,7 @@ uninstall: FORCE check-libcc-named: $(LIBCC_SRC) $(RMTREE) lib/gforth/$(VERSION)/libcc-named/ $(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/ - for i in $(LIBCC_SRC); do gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done + for i in $(LIBCC_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done check: gforths gforth.fi $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1