looks good to me. Can somebody apply? thanks!
On Sun, Aug 17, 2008 at 11:55 PM, Paul Jarc <[EMAIL PROTECTED]> wrote: > Reinhold Kainhofer <[EMAIL PROTECTED]> wrote: >> What Han-Wen meant was that you do a local commit by "git commit >> stepmake/aclocal.m4 b/stepmake/aclocal.m4" (don't worry, this does >> not upload anything to the server!), add a proper headline and >> description in the commit message and then create a git patch by >> running "git-format-patch origin". > > Ah, ok. How's this? > > --- > stepmake/aclocal.m4 | 2 +- > stepmake/stepmake/c++-vars.make | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 > index b69dc9c..d692776 100644 > --- a/stepmake/aclocal.m4 > +++ b/stepmake/aclocal.m4 > @@ -452,7 +452,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [ > using namespace std; > #include <FlexLexer.h> > EOF > - FLEXLEXER_FILE=`$CXX -E conftest.cc | \ > + FLEXLEXER_FILE=`eval $ac_cpp conftest.cc | \ > sed 's!# 1 "\(.*FlexLexer.h\)"[EMAIL PROTECTED]@\1@@!g' | grep '@@' > | \ > sed '[EMAIL PROTECTED]@\(.*\)@@.*$!\1!g' ` 1> /dev/null 2> /dev/null > rm conftest.cc > diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make > index fdc8b57..923377d 100644 > --- a/stepmake/stepmake/c++-vars.make > +++ b/stepmake/stepmake/c++-vars.make > @@ -6,7 +6,7 @@ EXTRA_CXXFLAGS = -W -Wall -Wconversion > #EXTRA_CXXFLAGS += -Werror > #endif > > -ALL_CXXPPFLAGS = $(DEFINES) $(INCLUDES:%=-I%) > +ALL_CXXPPFLAGS = $(CPPFLAGS) $(CONFIG_CPPFLAGS) $(DEFINES) $(INCLUDES:%=-I%) > ALL_CXXFLAGS = $(CXXFLAGS) $(ALL_CXXPPFLAGS) $($(PACKAGE)_CXXFLAGS) > $(CONFIG_CXXFLAGS) $(MODULE_CXXFLAGS) $(EXTRA_CXXFLAGS) > > TCC_FILES := $(call src-wildcard,*.tcc) > -- > 1.5.6.5 > > > > _______________________________________________ > lilypond-devel mailing list > [email protected] > http://lists.gnu.org/mailman/listinfo/lilypond-devel > -- Han-Wen Nienhuys - [EMAIL PROTECTED] - http://www.xs4all.nl/~hanwen _______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
