Skip to content

Commit

Permalink
Make newline in RHS of lib/configure sed substition more portable
Browse files Browse the repository at this point in the history
Commit 1b78e85 introduces a non-portable escaped newline
character in the substitution string. It does not work as
expected.

On a Linux machine it inserts an additional blank line
and on OSX it only inserts a leading 'n' which gives you
a broken lib/configure script.

Signed-off-by: Tuncer Ayaz <tuncer.ayaz@gmail.com>
  • Loading branch information
Tuncer Ayaz authored and Erlang/OTP committed Feb 9, 2010
1 parent c03fd1f commit c64a6e7
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions otp_build
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#! /bin/sh
#
# %CopyrightBegin%
#
#
# Copyright Ericsson AB 2002-2010. All Rights Reserved.
#
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
# compliance with the License. You should have received a copy of the
# Erlang Public License along with this software. If not, it can be
# retrieved online at http://www.erlang.org/.
#
#
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
# the License for the specific language governing rights and limitations
# under the License.
#
#
# %CopyrightEnd%
#

Expand Down Expand Up @@ -225,6 +225,8 @@ set_config_flags ()
export CONFIG_FLAGS;
}

NL="\
"
create_lib_configure_in()
{
cd $ERL_TOP
Expand All @@ -241,7 +243,7 @@ create_lib_configure_in()
lib/*)
if [ -f "$lib_app/configure.in" ]; then
app=`echo "$lib_app" | sed "s|lib/\(.*\)|\1|"`
sdirs="${sdirs}test ! -f $app/configure || AC_CONFIG_SUBDIRS($app/.)\n"
sdirs="${sdirs}test ! -f $app/configure || AC_CONFIG_SUBDIRS($app/.)${NL}"
fi;;
*)
;;
Expand All @@ -258,7 +260,7 @@ create_lib_configure_in()
done
if [ $is_bapp = false ] && [ -f "$lib_app/configure.in" ]; then
app=`echo "$lib_app" | sed "s|lib/\(.*\)|\1|"`
sdirs="${sdirs} test ! -f $app/configure || AC_CONFIG_SUBDIRS($app/.)\n"
sdirs="${sdirs} test ! -f $app/configure || AC_CONFIG_SUBDIRS($app/.)${NL}"
fi
done

Expand Down

0 comments on commit c64a6e7

Please sign in to comment.