From 3c6f6a572d4cf01a29db436929e435e0499387df Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 16 Sep 2013 22:37:49 +0200 Subject: Bypass checks for autoconf git checkout * As part of test preparations, autoconf's build system tries to determine if it lives in a checkout of the autoconf repository by looking if .git exists. In our case, .git exists, so the test preparation code tries to checkout a git submodule, which fails as the .git refers to the git repository created by haikuporter, not the autoconf repository. Circumvent this by causing the check for .git to always fail. diff --git a/maint.mk b/maint.mk index 1c7af03..41e4030 100644 --- a/maint.mk +++ b/maint.mk @@ -1294,7 +1294,7 @@ endef .PHONY: no-submodule-changes no-submodule-changes: - if test -d $(srcdir)/.git; then \ + if test -d $(srcdir)/.gitFOOBAR; then \ diff=$$(cd $(srcdir) && git submodule -q foreach \ git diff-index --name-only HEAD) \ || exit 1; \ @@ -1312,7 +1312,7 @@ submodule-checks ?= no-submodule-changes public-submodule-commit # cannot be built from a fresh clone. .PHONY: public-submodule-commit public-submodule-commit: - $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + $(AM_V_GEN)if test -d $(srcdir)/.gitFOOBAR; then \ cd $(srcdir) && \ git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \ = '$$(git merge-base origin $$sha1)' \ -- 1.8.3.4 From 66a0514f74a0e29994e3d42a10b5f4b1162aaa27 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 2 Oct 2013 16:18:53 +0200 Subject: Install prefix is now /boot/system diff --git a/INSTALL b/INSTALL index d60e29a..f386627 100644 --- a/INSTALL +++ b/INSTALL @@ -247,10 +247,10 @@ directory contains several dysfunctional programs; working variants of these programs are available in '/usr/bin'. So, if you need '/usr/ucb' in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in '/boot/common', + On Haiku, software installed for all users goes in '/boot/system', not '/usr/local'. It is recommended to use the following options: - ./configure --prefix=/boot/common + ./configure --prefix=/boot/system Specifying the System Type ========================== diff --git a/doc/install.texi b/doc/install.texi index 4c2ffb5..c1a987b 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -287,11 +287,11 @@ directory contains several dysfunctional programs; working variants of these programs are available in @code{/usr/bin}. So, if you need @code{/usr/ucb} in your @env{PATH}, put it @emph{after} @code{/usr/bin}. -On Haiku, software installed for all users goes in @file{/boot/common}, +On Haiku, software installed for all users goes in @file{/boot/system}, not @file{/usr/local}. It is recommended to use the following options: @example -./configure --prefix=/boot/common +./configure --prefix=/boot/system @end example @node System Type -- 1.8.3.4 From a357718b081f1678748ead5d7cb67c766c930441 Mon Sep 17 00:00:00 2001 From: Patrice Dumas Date: Wed, 18 Jul 2012 13:41:45 -0600 Subject: [PATCH] doc: fix texinfo macro usage The texinfo manual recommends avoiding the use of a trailing @c in any macro designed to be used inline (as is the case with our ovar and dvar macros). Furthermore, passing '@\n' in the middle of a macro call is much different than passing '@\n' between arguments of a @defmac for line continuation. * doc/autoconf.texi (ovar, dvar): Don't end macro with @c, since these macros are designed to be embedded in one-line usage. (Fortran Compiler): Don't split @dvar. * THANKS: Update. Reported by Stefano Lattarini. Signed-off-by: Eric Blake Copyright-paperwork-exempt: Yes --- THANKS | 1 + doc/autoconf.texi | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/THANKS b/THANKS index 25734d5..8682c87 100644 --- a/THANKS +++ b/THANKS @@ -316,6 +316,7 @@ Olly Betts olly@survex.com Ossama Othman ossama@debian.org Pallav Gupta pallavgupta@gmail.com Paolo Bonzini bonzini@gnu.org +Patrice Dumas pertusus@free.fr Patrick Tullmann tullmann@cs.utah.edu Patrick Welche prlw1@newn.cam.ac.uk Paul Berrevoets paul@swi.com diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 78a2c67..506d966 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -15,7 +15,7 @@ @c The ARG is an optional argument. To be used for macro arguments in @c their documentation (@defmac). @macro ovar{varname} -@r{[}@var{\varname\}@r{]}@c +@r{[}@var{\varname\}@r{]} @end macro @c @dvar(ARG, DEFAULT) @@ -23,7 +23,7 @@ @c The ARG is an optional argument, defaulting to DEFAULT. To be used @c for macro arguments in their documentation (@defmac). @macro dvar{varname, default} -@r{[}@var{\varname\} = @samp{\default\}@r{]}@c +@r{[}@var{\varname\} = @samp{\default\}@r{]} @end macro @c Handling the indexes with Texinfo yields several different problems. @@ -8014,10 +8014,10 @@ variables, respectively. The computed linker flags are cached in @code{ac_cv_f77_libs} or @code{ac_cv_fc_libs}, respectively. @end defmac -@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @ - AC_MSG_FAILURE}) -@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @ - AC_MSG_FAILURE}) +@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @ + @dvar{action-if-not-found, AC_MSG_FAILURE}) +@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @ + @dvar{action-if-not-found, AC_MSG_FAILURE}) @acindex{F77_DUMMY_MAIN} @cvindex F77_DUMMY_MAIN @acindex{FC_DUMMY_MAIN} @@ -8268,8 +8268,8 @@ results in @code{ac_cv_fc_srcext_@var{ext}} and @code{ac_cv_fc_pp_srcext_@var{ext}} variables, respectively. @end defmac -@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @dvar{action-if-failure, @ - AC_MSG_FAILURE}) +@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @ + @dvar{action-if-failure, AC_MSG_FAILURE}) @acindex{FC_PP_DEFINE} @caindex fc_pp_define @@ -8287,8 +8287,8 @@ The result of this test is cached in the @code{ac_cv_fc_pp_define} variable. @end defmac -@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @dvar{action-if-failure, @ - AC_MSG_FAILURE}) +@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @ + @dvar{action-if-failure, AC_MSG_FAILURE}) @acindex{FC_FREEFORM} @caindex fc_freeform @@ -8314,8 +8314,8 @@ The result of this test, or @samp{none} or @samp{unknown}, is cached in the @code{ac_cv_fc_freeform} variable. @end defmac -@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @dvar{action-if-failure, @ - AC_MSG_FAILURE}) +@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @ + @dvar{action-if-failure, AC_MSG_FAILURE}) @acindex{FC_FIXEDFORM} @caindex fc_fixedform -- 1.9.1