Update ICU to 54.1 step 1

source/config/Makefile.inc.in

 ## -*-makefile-*-
 #******************************************************************************
-#   Copyright (C) 1999-2012, International Business Machines
+#   Copyright (C) 1999-2014, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #******************************************************************************
 # This Makefile.inc is designed to be included into projects which make use
 # of the ICU.
 
 # CONTENTS OF THIS FILE
 # 1). Base configuration information and linkage
 # 2). Variables giving access to ICU tools
 # 3). Host information
 # 4). Compiler flags and settings 
@@ skipping 94 matching lines @@
 
 ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_DATA   = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_I18N   = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_BASE = $(LIBS) -L$(libdir)
+ICULIBS_BASE = -L$(libdir)
 
 # for icu-config to test with
 ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
 ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
 
 # ICULIBS is the set of libraries your application should link
 # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
 ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
 
 # Proper echo newline handling is needed in icu-config
@@ skipping 50 matching lines @@
 ##################################################################
 #
 #       *4*  compiler flags and misc. options
 #
 ##################################################################
 AR = @AR@
 # initial tab keeps it out of the shell version.
         ARFLAGS := @ARFLAGS@ $(ARFLAGS)
 #SH#ARFLAGS="@ARFLAGS@ ${ARFLAGS}"
 CC = @CC@
-CFLAGS = @CFLAGS@ 
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(prefix)/include
+CFLAGS = @UCONFIG_CFLAGS@ 
+CPPFLAGS = @UCONFIG_CPPFLAGS@ -I$(prefix)/include
+CXXFLAGS = @UCONFIG_CXXFLAGS@
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ 
 DEFAULT_MODE = @DATA_PACKAGING_MODE@
 DEFS = @DEFS@ 
-FFLAGS = @FFLAGS@
 # use a consistent INSTALL 
 INSTALL  =  $(SHELL) $(pkgdatadir)/install-sh -c
 INSTALL_DATA  =  @INSTALL_DATA@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM  =  @INSTALL_PROGRAM@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
+LDFLAGS = $(RPATHLDFLAGS)
 LIBS = @LIBS@ 
 LIB_M = @LIB_M@
 LIB_VERSION = @LIB_VERSION@
 LIB_VERSION_MAJOR = @LIB_VERSION_MAJOR@
 MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs
 RANLIB = @RANLIB@
 RMV = rm -rf
 SHELL = @SHELL@
 SHLIB.c=      $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
 SHLIB.cc=     $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
@@ skipping 70 matching lines @@
 # The selfcheck is just a sanity check that this makefile is
 # parseable. The mh fragment is only included if this does not occur.
 
 ifeq (selfcheck,$(MAKECMDGOALS)) #M#
 selfcheck: #M#
         @echo passed #M#
 else #M#
 include $(pkgdatadir)/config/@platform_make_fragment_name@
 endif #M#