diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/etc/Makefile.in | 56 |
2 files changed, 40 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 55fd759f..20bb3ea8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-05-23 Gabriel Dos Reis <gdr@cs.tamu.edu> + + Fix AW/57 + * etc/Makefile.in: Make all databases part of the final system. + 2008-05-22 Gabriel Dos Reis <gdr@cs.tamu.edu> * hyper/token.h: Avoid numeric constants macros. diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in index 60605377..11cddbbe 100644 --- a/src/etc/Makefile.in +++ b/src/etc/Makefile.in @@ -33,6 +33,12 @@ INTERPSYS = ../interp/interpsys$(EXEEXT) -- --system="$(AXIOM)" \ --sysalg="$(axiom_src_datadir)/algebra/" +openaxiom_databases = \ + $(addprefix $(axiom_targetdir)/algebra/, \ + compress.daase interp.daase browse.daase categor.daase \ + operation.daase libdb.text comb.text \ + USERS.DAASE/index.KAF DEPENDENTS.DAASE/index.KAF) + subdir = src/etc/ pamphlets = Makefile.pamphlet $(asq_SOURCES) @@ -44,20 +50,27 @@ all: all-ax all-ax all-asq: stamp @echo finished $(builddir) -stamp: $(axiom_targetdir)/algebra/*.daase $(axiom_target_bindir)/asq$(EXEEXT) \ +stamp: $(openaxiom_databases) $(axiom_target_bindir)/asq$(EXEEXT) \ $(axiom_target_libdir)/summary \ $(axiom_target_libdir)/copyright - -rm -f stamp + rm -f stamp $(STAMP) stamp -$(axiom_targetdir)/algebra/*.daase: ../algebra/*.NRLIB/code.$(FASLEXT) - @ echo 4 rebuilding databases... - @ $(INSTALL_DATA) $(axiom_src_docdir)/topics.data ../algebra - @ (cd ../algebra ; \ - echo ')lisp (make-databases nil)' | ${INTERPSYS} ) - @ $(INSTALL_DATA) ../algebra/*.daase $(axiom_targetdir)/algebra - @ $(INSTALL_DATA) ../algebra/libdb.text $(axiom_targetdir)/algebra - @ $(INSTALL_DATA) ../algebra/comdb.text $(axiom_targetdir)/algebra +$(openaxiom_databases): ../algebra/*.NRLIB/code.$(FASLEXT) + @ echo rebuilding databases... + cp $(axiom_src_docdir)/topics.data ../algebra + (cd ../algebra ; \ + echo ')lisp (make-databases nil)' | $(INTERPSYS) ) + mkdir -p $(axiom_targetdir)/algebra + cp -p ../algebra/*.daase $(axiom_targetdir)/algebra + cp -p ../algebra/libdb.text $(axiom_targetdir)/algebra + cp -p ../algebra/comdb.text $(axiom_targetdir)/algebra + mkdir -p $(axiom_targetdir)/algebra/USERS.DAASE + cp -p ../algebra/USERS.DAASE/index.KAF \ + $(axiom_targetdir)/algebra/USERS.DAASE + mkdir -p $(axiom_targetdir)/algebra/DEPENDENTS.DAASE + cp -p ../algebra/DEPENDENTS.DAASE/index.KAF \ + $(axiom_targetdir)/algebra/DEPENDENTS.DAASE bin_PROGRAMS = asq$(EXEEXT) asq_sources = asq.c @@ -65,27 +78,28 @@ asq_SOURCES = $(addsuffix .pamphlet, $(asq_sources)) asq_objects = $(asq_sources:.c=.$(OBJEXT)) $(axiom_target_bindir)/asq$(EXEEXT): asq.c $(axiom_c_macros_h) - @echo 4 making $@ from $< - ${CC} ${CCF} $(axiom_includes) -o asq asq.c - $(INSTALL_PROGRAM) asq $(axiom_target_bindir) + @echo making $@ from $< + ${CC} ${CCF} $(axiom_includes) -o asq$(EXEEXT) asq.c + cp -p asq$(EXEEXT) $(axiom_target_bindir) asq.c: $(srcdir)/asq.c.pamphlet $(axiom_build_document) --tangle --output=$@ $< $(axiom_target_libdir)/summary: $(srcdir)/summary - $(INSTALL_DATA) $< $@ + cp -p $< $@ $(axiom_target_libdir)/copyright: $(srcdir)/copyright - $(INSTALL_DATA) $< $@ + cp -p $< $@ mostlyclean-local: - -rm -f $(asq_sources) $(asq_objects) - -rm -f stamp + rm -f $(asq_sources) $(asq_objects) + rm -f $(openaxiom_databases) + rm -f stamp clean-local: mostlyclean-local - -rm -f $(axiom_target_libdir)/summary - -rm -f $(axiom_target_libdir)/copyright - -rm -f $(axiom_target_bindir)/axiom - -rm -f $(axiom_target_bindir)/asq$(EXEEXT) + rm -f $(axiom_target_libdir)/summary + rm -f $(axiom_target_libdir)/copyright + rm -f $(axiom_target_bindir)/axiom + rm -f $(axiom_target_bindir)/asq$(EXEEXT) distclean-local: clean-local |