--- Makefile.in 2010-11-30 16:22:42.000000000 -0800

+++ Makefile.in 2011-11-29 09:25:06.137627684 -0800

@@ -137,7 +137,7 @@

STATIC_LD = @STATIC_LD@

LOCAL_LDFLAGS = @LOCAL_LDFLAGS@

-SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)

+SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)

BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \

$(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)

@@ -538,7 +538,7 @@

$(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)

$(RM) $@

- $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)

+ $(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s

ls -l $(Program)

-$(SIZE) $(Program)

@@ -552,10 +552,10 @@

@echo

bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)

- @sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \

- -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \

- -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \

- -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \

+ @sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \

+ -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \

+ -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \

+ -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \

$(SUPPORT_SRC)bashbug.sh > $@

@chmod a+rx bashbug

@@ -842,7 +842,7 @@

@-test -d tests || mkdir tests

@cp $(TESTS_SUPPORT) tests

@( cd $(srcdir)/tests && \

- PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )

+ PATH=/usr/gnu/bin:$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )

symlinks:

$(SHELL) $(SUPPORT_SRC)fixlinks -s $(srcdir)