Commit a992a8c4 authored by anton's avatar anton

DESTDIR is now not in the INCLUDED-FILES of the installed gforth.fi

parent 9fb1614b
......@@ -603,7 +603,7 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen do
echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
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 GFORTHPATH=.:"$$GFORTHPATH" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
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 GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
$(RM) gforth.fi install.TAGS
......
......@@ -24,6 +24,14 @@
addr1 addr2 u move
addr2 u ;
: delete-prefix ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
\ if c-addr2 u2 is a prefix of c-addr1 u1, delete it
2over 2over string-prefix? if
nip /string
else
2drop
endif ;
: update-image-included-files ( -- )
included-files 2@ { addr cnt }
image-included-files 2@ { old-addr old-cnt }
......@@ -33,7 +41,8 @@
old-addr new-addr old-cnt 2* cells move
cnt old-cnt
U+DO
addr i 2* cells + 2@ save-mem-dict
addr i 2* cells + 2@
s" GFORTHDESTDIR" getenv delete-prefix save-mem-dict
new-addr i 2* cells + 2!
LOOP
maxalign ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment