diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | Makefile.pamphlet | 8 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 |
6 files changed, 23 insertions, 19 deletions
@@ -1,3 +1,7 @@ +2008-02-17 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (install): Tidy. + 2008-02-14 Gabriel Dos Reis <gdr@cs.tamu.edu> * OpenAxiom-1.1.0 has been released. diff --git a/Makefile.in b/Makefile.in index 2a33363d..6a823af9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,12 +96,12 @@ $(axiom_build_bindir)/gcl$(EXEEXT): ./configure --prefix="$(axiom_abs_builddir)" ${GCLOPTS} && \ $(MAKE) && $(MAKE) install install: - @echo Installing OpenAxiom in $(prefix) + @echo Installing OpenAxiom in $(DESTDIR)$(prefix) @$(mkinstalldirs) "$(DESTDIR)$(open_axiom_installdir)" cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(open_axiom_installdir)" - rm -f "$(bindir)"/open-axiom - @$(mkinstalldirs) "$(bindir)" - $(INSTALL_PROGRAM) src/driver/open-axiom$(EXEEXT) "$(bindir)" + rm -f "$(DESTDIR)$(bindir)"/open-axiom + @$(mkinstalldirs) "$(DESTDIR)$(bindir)" + $(INSTALL_PROGRAM) src/driver/open-axiom$(EXEEXT) "$(DESTDIR)$(bindir)" @echo OpenAxiom installation finished. .PHONY: check diff --git a/Makefile.pamphlet b/Makefile.pamphlet index c3a14132..1566a478 100644 --- a/Makefile.pamphlet +++ b/Makefile.pamphlet @@ -562,12 +562,12 @@ $(addprefix $(axiom_build_bindir)/, notangle noweave): maybe-cp-noweb-srcdir \subsection{install} <<install>>= install: - @echo Installing OpenAxiom in $(prefix) + @echo Installing OpenAxiom in $(DESTDIR)$(prefix) @$(mkinstalldirs) "$(DESTDIR)$(open_axiom_installdir)" cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(open_axiom_installdir)" - rm -f "$(bindir)"/open-axiom - @$(mkinstalldirs) "$(bindir)" - $(INSTALL_PROGRAM) src/driver/open-axiom$(EXEEXT) "$(bindir)" + rm -f "$(DESTDIR)$(bindir)"/open-axiom + @$(mkinstalldirs) "$(DESTDIR)$(bindir)" + $(INSTALL_PROGRAM) src/driver/open-axiom$(EXEEXT) "$(DESTDIR)$(bindir)" @echo OpenAxiom installation finished. @ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-02-15. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-02-18. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.2.0-2008-02-15' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-02-15' +PACKAGE_VERSION='1.2.0-2008-02-18' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-02-18' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1387,7 +1387,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.2.0-2008-02-15 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-02-18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-02-15:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-02-18:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-02-15 +OpenAxiom configure 1.2.0-2008-02-18 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.2.0-2008-02-15, which was +It was created by OpenAxiom $as_me 1.2.0-2008-02-18, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25230,7 +25230,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.2.0-2008-02-15, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-02-18, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25279,7 +25279,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-02-15 +OpenAxiom config.status 1.2.0-2008-02-18 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index b2d15d9e..7c29d6cf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-02-15], +AC_INIT([OpenAxiom], [1.2.0-2008-02-18], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index be5ba1a8..abacc25f 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1022,7 +1022,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-02-15], +AC_INIT([OpenAxiom], [1.2.0-2008-02-18], [open-axiom-bugs@lists.sf.net]) @ |