aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog14
-rw-r--r--src/Makefile.in14
-rw-r--r--src/Makefile.pamphlet14
-rw-r--r--src/algebra/Makefile.in12
-rw-r--r--src/algebra/Makefile.pamphlet12
-rw-r--r--src/boot/Makefile.in6
-rw-r--r--src/graph/Makefile.in4
-rw-r--r--src/hyper/Makefile.in4
-rw-r--r--src/input/Makefile.in6
-rw-r--r--src/input/Makefile.pamphlet6
-rw-r--r--src/interp/Makefile.in14
-rw-r--r--src/interp/Makefile.pamphlet14
-rw-r--r--src/lib/Makefile.in2
-rw-r--r--src/lisp/Makefile.in8
-rw-r--r--src/share/Makefile.in4
15 files changed, 74 insertions, 60 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c9c22efc..5703c54f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Use $(mkdir_p) in lieu of $(mkinstalldirs),
+ during build. Also use 'cp -p' instead of $(INSTALL).
+ * algebra/Makefile.pamphlet: Likewise.
+ * graph/Makefile.in: Likewise.
+ * boot/Makefile.in: Likewise.
+ * hyper/Makefile.in: Likewise.
+ * input/Makefile.pamphlet: Likewise.
+ * interp/Makefile.pamphlet: Likewise.
+ * lib/Makefile.in: Likewise.
+ * lisp/Makefile.in: Likewise.
+ * share/Makefile.in: Likewise.
+
2008-08-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/pf2sex.boot: Replace CAR with first, and CARD with second
diff --git a/src/Makefile.in b/src/Makefile.in
index e25ca169..011f75bd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -20,18 +20,18 @@ all-driver:
@cd driver && $(MAKE) $@
all-clef: all-lib
- @$(mkinstalldirs) $(axiom_target_bindir)
+ @$(mkdir_p) $(axiom_target_bindir)
cd clef && ${MAKE}
all-sman: all-lib all-driver
- $(mkinstalldirs) $(axiom_target_bindir)
- $(mkinstalldirs) $(axiom_target_libdir)
+ $(mkdir_p) $(axiom_target_bindir)
+ $(mkdir_p) $(axiom_target_libdir)
cd sman && ${MAKE}
all-hyper: all-lib
- $(mkinstalldirs) $(axiom_target_bindir)
- $(mkinstalldirs) $(axiom_target_datadir)
+ $(mkdir_p) $(axiom_target_bindir)
+ $(mkdir_p) $(axiom_target_datadir)
cd hyper && ${MAKE}
all-share:
- $(mkinstalldirs) $(axiom_target_libdir)
+ $(mkdir_p) $(axiom_target_libdir)
cd share && ${MAKE}
all-doc:
cd doc && ${MAKE}
@@ -47,7 +47,7 @@ all-interpsys: all-boot all-hyper-pre
all-axiomsys: all-asq
cd interp && $(MAKE) all-axiomsys
all-algebra: all-interpsys all-share all-hyper-pre
- @ $(mkinstalldirs) algebra/strap
+ @ $(mkdir_p) algebra/strap
cd algebra && ${MAKE}
all-hyper-pre: all-lib
diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet
index 0b9b2275..f7a0d007 100644
--- a/src/Makefile.pamphlet
+++ b/src/Makefile.pamphlet
@@ -56,7 +56,7 @@ The {\bf clef} directory contains an Axiom command that works similar
to GNU Readline.
<<clefdir>>=
all-clef: all-lib
- @$(mkinstalldirs) $(axiom_target_bindir)
+ @$(mkdir_p) "$(axiom_target_bindir)"
cd clef && ${MAKE}
@
@@ -66,8 +66,8 @@ Superman (\Tool{sman}) is the master process that runs all of the other
processes including \Tool{axiom}, \Tool{clef}, nagman, graphics, and hyperdoc
<<smandir>>=
all-sman: all-lib all-driver
- $(mkinstalldirs) $(axiom_target_bindir)
- $(mkinstalldirs) $(axiom_target_libdir)
+ $(mkdir_p) "$(axiom_target_bindir)"
+ $(mkdir_p) "$(axiom_target_libdir)"
cd sman && ${MAKE}
@
@@ -76,8 +76,8 @@ all-sman: all-lib all-driver
Hyperdoc is the Axiom document browser.
<<hyperdir>>=
all-hyper: all-lib
- $(mkinstalldirs) $(axiom_target_bindir)
- $(mkinstalldirs) $(axiom_target_datadir)
+ $(mkdir_p) "$(axiom_target_bindir)"
+ $(mkdir_p) "$(axiom_target_datadir)"
cd hyper && ${MAKE}
@
@@ -88,7 +88,7 @@ system.
<<sharedir>>=
all-share:
- $(mkinstalldirs) $(axiom_target_libdir)
+ $(mkdir_p) "$(axiom_target_libdir)"
cd share && ${MAKE}
@
@@ -175,7 +175,7 @@ the normal Makefile information.
<<algebradir>>=
all-algebra: all-interpsys all-share all-hyper-pre
- @ $(mkinstalldirs) algebra/strap
+ @ $(mkdir_p) algebra/strap
cd algebra && ${MAKE}
all-hyper-pre: all-lib
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index c10fa2c3..93dd4d36 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -839,7 +839,7 @@ stamp: mkdir-output-directory ${SPADFILES} bootstrap-stamp ${TESTS}
$(STAMP) stamp
mkdir-output-directory:
- $(mkinstalldirs) $(OUTSRC)
+ $(mkdir_p) $(OUTSRC)
everything: check lib db cmd gloss
@ echo 4303 invoking make in `pwd` with parms:
@@ -873,7 +873,7 @@ ${OUTSRC}/%.spad: $(srcdir)/%.spad.pamphlet
.PHONY: mk-target-src-algabra-dir
mk-target-src-algabra-dir:
- @ [ -d $(OUTSRC) ] || $(mkinstalldirs) $(OUTSRC)
+ @ [ -d $(OUTSRC) ] || $(mkdir_p) $(OUTSRC)
.PRECIOUS: $(builddir)/%.tex
.PRECIOUS: $(builddir)/%.dvi
@@ -882,10 +882,10 @@ $(DOC)/%.dvi: mk-target-doc-dir
.PHONY: mk-target-doc-dir
mk-target-doc-dir:
- @ [ -d $(DOC) ] || $(mkinstalldirs) $(DOC)
+ @ [ -d $(DOC) ] || $(mkdir_p) $(DOC)
$(DOC)/%.dvi: $(builddir)/%.dvi
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
$(builddir)/%.dvi: $(axiom_build_texdir)/diagrams.tex \
$(axiom_build_texdir)/axiom.sty
@@ -897,7 +897,7 @@ $(builddir)/%.tex: $(srcdir)/%.pamphlet
$(axiom_build_document) --weave --output=$@ $<
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad
@ rm -rf SPADPRSR.NRLIB
@@ -920,7 +920,7 @@ ${INPUT}/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet
${DOC}/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
$(axiom_algebra_layer_0_objects): strap-stamp
$(axiom_algebra_layer_1_objects): 0-stamp
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index a455d264..84eca427 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -1814,7 +1814,7 @@ ${OUTSRC}/%.spad: $(srcdir)/%.spad.pamphlet
.PHONY: mk-target-src-algabra-dir
mk-target-src-algabra-dir:
- @ [ -d $(OUTSRC) ] || $(mkinstalldirs) $(OUTSRC)
+ @ [ -d $(OUTSRC) ] || $(mkdir_p) $(OUTSRC)
@
<<genericDOCfiles>>=
@@ -1825,10 +1825,10 @@ $(DOC)/%.dvi: mk-target-doc-dir
.PHONY: mk-target-doc-dir
mk-target-doc-dir:
- @ [ -d $(DOC) ] || $(mkinstalldirs) $(DOC)
+ @ [ -d $(DOC) ] || $(mkdir_p) $(DOC)
$(DOC)/%.dvi: $(builddir)/%.dvi
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
$(builddir)/%.dvi: $(axiom_build_texdir)/diagrams.tex \
$(axiom_build_texdir)/axiom.sty
@@ -1840,7 +1840,7 @@ $(builddir)/%.tex: $(srcdir)/%.pamphlet
$(axiom_build_document) --weave --output=$@ $<
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
@
<<genericRules>>=
@@ -1862,7 +1862,7 @@ PARSER.NRLIB/code.$(FASLEXT): script-parser.spad
<<diagrams.tex (OUT from IN)>>=
${DOC}/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
@
@@ -2261,7 +2261,7 @@ stamp: mkdir-output-directory ${SPADFILES} bootstrap-stamp ${TESTS}
$(STAMP) stamp
mkdir-output-directory:
- $(mkinstalldirs) $(OUTSRC)
+ $(mkdir_p) $(OUTSRC)
everything: check lib db cmd gloss
@ echo 4303 invoking make in `pwd` with parms:
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index f8d57bd9..bbb17612 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -86,8 +86,8 @@ stamp: $(axiom_target_bindir)/bootsys$(EXEEXT)
## The final `bootsys' image.
$(axiom_target_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
- $(mkinstalldirs) $(axiom_target_bindir)
- $(INSTALL_PROGRAM) $< $@
+ $(mkdir_p) $(axiom_target_bindir)
+ cp -p $< $@
.PRECIOUS: strap/%.$(FASLEXT)
@@ -169,7 +169,7 @@ stage2/%.clisp: %.boot stage1/stamp stage2/.started
.PRECIOUS: %/.started
%/.started:
- $(mkinstalldirs) $*
+ $(mkdir_p) $*
$(STAMP) $@
## Dependency for various modules.
diff --git a/src/graph/Makefile.in b/src/graph/Makefile.in
index ed1a4655..ec2f3372 100644
--- a/src/graph/Makefile.in
+++ b/src/graph/Makefile.in
@@ -52,7 +52,7 @@ all-subdirs: all-subdirs.pre all-subdirs.rest
.PHONY: all-subdirs.pre
all-subdirs.pre:
-rm -f stamp
- $(mkinstalldirs) parabola
+ $(mkdir_p) parabola
.PHONY: all-subdirs.rest
all-subdirs.rest: all-subdirs.pre all-Gdraws all-viewman \
@@ -62,7 +62,7 @@ all-subdirs.rest: all-subdirs.pre all-Gdraws all-viewman \
all-viewman: all-Gdraws
cd viewman && ${MAKE}
all-Gdraws:
- @$(mkinstalldirs) $(axiom_target_libdir)/graph
+ @$(mkdir_p) $(axiom_target_libdir)/graph
cd Gdraws && ${MAKE}
all-view3D: all-Gdraws
cd view3D && ${MAKE}
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in
index 2c968607..034180f3 100644
--- a/src/hyper/Makefile.in
+++ b/src/hyper/Makefile.in
@@ -159,10 +159,10 @@ ${HYPER}/pages/ht.db: all-hyper-pre $(srcdir)/pages/*.pht
${OUTLIB}/htsearch: htsearch
- $(INSTALL_PROGRAM) $< $@
+ cp -p $< $@
${OUTLIB}/presea: presea
- $(INSTALL_PROGRAM) $< $@
+ cp -p $< $@
${OUTLIB}/ex2ht$(EXEEXT): $(ex2ht_objects) $(ex2ht_DEPENDENCIES)
${LINK} -o $@ $(ex2ht_objects) $(ex2ht_LDADD)
diff --git a/src/input/Makefile.in b/src/input/Makefile.in
index 2c1195b0..2eabdecc 100644
--- a/src/input/Makefile.in
+++ b/src/input/Makefile.in
@@ -505,11 +505,11 @@ all-ax all-input: $(OUT) ${FILES} ${FILES2} ${ASFILES}
@echo 1 finished $(srcdir)
$(OUT):
- $(mkinstalldirs) $@
+ $(mkdir_p) $@
${OUT}/%.input: %.input
- @ $(INSTALL) $< $@
+ @cp -p $< $@
.PRECIOUS: %.input
@@ -517,7 +517,7 @@ ${OUT}/%.input: %.input
@$(axiom_build_document) --output=$@ --tangle $<
${OUT}/%.as: %.as
- @ $(INSTALL) $< $@
+ @cp -p $< $@
%.as: ${IN}/%.as.pamphlet
@ $(axiom_build_document) --output=$@ --tangle $<
diff --git a/src/input/Makefile.pamphlet b/src/input/Makefile.pamphlet
index 484e1501..6b673e35 100644
--- a/src/input/Makefile.pamphlet
+++ b/src/input/Makefile.pamphlet
@@ -52,7 +52,7 @@ regress target.
<<genericRules>>=
${OUT}/%.input: %.input
- @ $(INSTALL) $< $@
+ @cp -p $< $@
.PRECIOUS: %.input
@@ -60,7 +60,7 @@ ${OUT}/%.input: %.input
@$(axiom_build_document) --output=$@ --tangle $<
${OUT}/%.as: %.as
- @ $(INSTALL) $< $@
+ @cp -p $< $@
%.as: ${IN}/%.as.pamphlet
@ $(axiom_build_document) --output=$@ --tangle $<
@@ -878,7 +878,7 @@ all-ax all-input: $(OUT) ${FILES} ${FILES2} ${ASFILES}
@echo 1 finished $(srcdir)
$(OUT):
- $(mkinstalldirs) $@
+ $(mkdir_p) $@
<<genericRules>>
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 4ba8c7ac..3d14df97 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -168,7 +168,7 @@ remove-stamp:
build-images: remove-stamp all-interpsys
all-interpsys:
- $(mkinstalldirs) $(AUTO)
+ $(mkdir_p) $(AUTO)
$(MAKE) $(SAVESYS)
all-axiomsys: all-interpsys
@@ -192,8 +192,8 @@ makeint.lisp: ${OBJS} util.$(FASLEXT) \
../algebra/warm.data
@ echo 5 invoking make in `pwd` with parms:
@rm -f makeint.lisp
- $(mkinstalldirs) $(axiom_target_datadir)/msgs
- $(INSTALL_DATA) $(axiom_src_docdir)/msgs/s2-us.msgs \
+ $(mkdir_p) $(axiom_target_datadir)/msgs
+ cp -p $(axiom_src_docdir)/msgs/s2-us.msgs \
$(axiom_target_datadir)/msgs
@ echo '(|importModule| "sys-driver")' >> makeint.lisp
@ echo '(|importModule| "vmlisp")' >> makeint.lisp
@@ -219,7 +219,7 @@ ${SAVESYS}: makeint.lisp
--make --output=$@ --main="BOOT::|restart|" \
--load-directory=. makeint.lisp
@ echo 6 ${SAVESYS} created
- $(mkinstalldirs) $(axiom_target_bindir)
+ $(mkdir_p) $(axiom_target_bindir)
.PHONY: all-axiomsys
all-axiomsys: ${AXIOMSYS}
@@ -237,7 +237,7 @@ exposed.lsp: $(axiom_src_algdir)/exposed.lsp.pamphlet
$(axiom_targetdir)/algebra/exposed.$(FASLEXT) : exposed.lsp ${LISPSYS}
@ echo 616 making $@ from exposed.lsp
- $(mkinstalldirs) $(axiom_targetdir)/algebra
+ $(mkdir_p) $(axiom_targetdir)/algebra
$(BOOTSYS) --compile --output=$@ --load-directory=. $<
database.date:
@@ -249,7 +249,7 @@ database.date:
.PREVIOUS: $(AUTO)/%.$(FASLEXT)
$(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
- $(INSTALL) $< $@
+ @cp -p $< $@
%.$(FASLEXT): %.boot
$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -454,5 +454,5 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index ff974c41..83650fd9 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -385,8 +385,8 @@ makeint.lisp: ${OBJS} util.$(FASLEXT) \
../algebra/warm.data
@ echo 5 invoking make in `pwd` with parms:
@rm -f makeint.lisp
- $(mkinstalldirs) $(axiom_target_datadir)/msgs
- $(INSTALL_DATA) $(axiom_src_docdir)/msgs/s2-us.msgs \
+ $(mkdir_p) $(axiom_target_datadir)/msgs
+ cp -p $(axiom_src_docdir)/msgs/s2-us.msgs \
$(axiom_target_datadir)/msgs
@ echo '(|importModule| "sys-driver")' >> makeint.lisp
@ echo '(|importModule| "vmlisp")' >> makeint.lisp
@@ -412,7 +412,7 @@ ${SAVESYS}: makeint.lisp
--make --output=$@ --main="BOOT::|restart|" \
--load-directory=. makeint.lisp
@ echo 6 ${SAVESYS} created
- $(mkinstalldirs) $(axiom_target_bindir)
+ $(mkdir_p) $(axiom_target_bindir)
@
\section{Building SAVESYS and AXIOMSYS}
@@ -442,7 +442,7 @@ ${AXIOMSYS}: makeint.lisp
<<DVI from pamphlet>>=
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
- $(INSTALL_DATA) $< $@
+ @cp -p $< $@
@
\section{The databases}
@@ -478,7 +478,7 @@ exposed.lsp: $(axiom_src_algdir)/exposed.lsp.pamphlet
$(axiom_targetdir)/algebra/exposed.$(FASLEXT) : exposed.lsp ${LISPSYS}
@ echo 616 making $@ from exposed.lsp
- $(mkinstalldirs) $(axiom_targetdir)/algebra
+ $(mkdir_p) $(axiom_targetdir)/algebra
$(BOOTSYS) --compile --output=$@ --load-directory=. $<
database.date:
@@ -515,7 +515,7 @@ remove-stamp:
build-images: remove-stamp all-interpsys
all-interpsys:
- $(mkinstalldirs) $(AUTO)
+ $(mkdir_p) $(AUTO)
$(MAKE) $(SAVESYS)
all-axiomsys: all-interpsys
@@ -537,7 +537,7 @@ distclean-local: clean-local
.PREVIOUS: $(AUTO)/%.$(FASLEXT)
$(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
- $(INSTALL) $< $@
+ @cp -p $< $@
%.$(FASLEXT): %.boot
$(BOOTSYS) --compile --output=$@ --load-directory=. $<
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 233bf6cf..3899031e 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -74,7 +74,7 @@ stamp: $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) \
$(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
$(libopen_axiom_core_objects)
- $(mkinstalldirs) $(axiom_target_libdir)
+ $(mkdir_p) $(axiom_target_libdir)
$(LINK_SHRLIB) $(oa_shrlib_flags) -o $@ \
$(libopen_axiom_core_objects) \
@axiom_c_runtime_extra@ -lm
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 46c10a6e..0c24a2c9 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -94,11 +94,11 @@ ifeq (@axiom_lisp_flavor@,gcl)
' si::*system-directory* (quote (list ".lsp")))' \
' "$(lisp_c_objects) @axiom_c_runtime_extra@"))' \
| ./base-lisp$(EXEEXT)
- $(mkinstalldirs) $(OUT)
- $(INSTALL_PROGRAM) lisp$(EXEEXT) $(OUT)
+ $(mkdir_p) $(OUT)
+ cp -p lisp$(EXEEXT) $(OUT)
else
- $(mkinstalldirs) $(OUT)
- $(INSTALL_PROGRAM) $< $@ && $(INSTALL_PROGRAM) $< lisp$(EXEEXT)
+ $(mkdir_p) $(OUT)
+ cp -p $< $@ && cp -p $< lisp$(EXEEXT)
endif
ifeq (@axiom_lisp_flavor@,ecl)
diff --git a/src/share/Makefile.in b/src/share/Makefile.in
index b250a679..6939be5b 100644
--- a/src/share/Makefile.in
+++ b/src/share/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, Gabriel Dos Reis.
+# Copyright (C) 2007-2008, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -53,4 +53,4 @@ clean-local: mostlyclean-local
distclean-local: clean-local
$(axiom_target_libdir)/command.list: $(srcdir)/algebra/command.list
- $(INSTALL_DATA) $< $@
+ cp -p $< $@
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 01:53:42 +0000