X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..4388f060552cc537e71e957d32f35e9d75a61233:/icuSources/config/Makefile.inc.in

diff --git a/icuSources/config/Makefile.inc.in b/icuSources/config/Makefile.inc.in
index 172ff20e..7a4496ef 100644
--- a/icuSources/config/Makefile.inc.in
+++ b/icuSources/config/Makefile.inc.in
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 #******************************************************************************
-#   Copyright (C) 1999-2005, International Business Machines
+#   Copyright (C) 1999-2011, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #******************************************************************************
 # This Makefile.inc is designed to be included into projects which make use
@@ -30,6 +30,7 @@ exec_prefix = @exec_prefix@
 libdir = @libdir@
 libexecdir = @libexecdir@
 bindir = @bindir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 sbindir = @sbindir@
 
@@ -62,13 +63,18 @@ RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
 endif
 
 #SH## icu-config version of above 'if':
-#SH#case "$ENABLE_RPATH" in 
-#SH#     [yY]*)
+#SH#case "x$ENABLE_RPATH" in 
+#SH#     x[yY]*)
 #SH# 	ENABLE_RPATH=YES
 #SH# 	RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}"
 #SH# 	;;
 #SH#
-#SH#     [nN]*)
+#SH#     x[nN]*)
+#SH# 	ENABLE_RPATH=NO
+#SH# 	RPATHLDFLAGS=""
+#SH# 	;;
+#SH#
+#SH#     x)
 #SH# 	ENABLE_RPATH=NO
 #SH# 	RPATHLDFLAGS=""
 #SH# 	;;
@@ -112,12 +118,19 @@ ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 ICULIBS_BASE = $(LIBS) -L$(libdir)
 
 # for icu-config to test with
-ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
+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
+ECHO_N=@ICU_ECHO_N@
+ECHO_C=@ICU_ECHO_C@
+# Not currently being used but good to have for proper tab handling
+ECHO_T=@ICU_ECHO_T@
+
 ##################################################################
 ##################################################################
 #
@@ -136,10 +149,15 @@ MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
 # Use as follows:  $(INVOKE) $(GENRB) arguments .. 
 INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
 GENCCODE = $(sbindir)/genccode
+ICUPKG   = $(sbindir)/icupkg
 GENCMN   = $(sbindir)/gencmn
 GENRB    = $(bindir)/genrb
 PKGDATA  = $(bindir)/pkgdata
 
+# moved here because of dependencies
+pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
+pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
+
 ##################################################################
 ##################################################################
 #
@@ -163,7 +181,6 @@ platform = @platform@
 #       *4*  compiler flags and misc. options
 #
 ##################################################################
-AIX_SHLIB = @AIX_SHLIB@
 AR = @AR@
 # initial tab keeps it out of the shell version.
 	ARFLAGS := @ARFLAGS@ $(ARFLAGS)
@@ -177,7 +194,8 @@ CXXFLAGS = @CXXFLAGS@
 DEFAULT_MODE = @DATA_PACKAGING_MODE@
 DEFS = @DEFS@ 
 FFLAGS = @FFLAGS@
-INSTALL  =  @INSTALL@
+# use a consistent INSTALL 
+INSTALL  =  $(SHELL) $(pkgdatadir)/install-sh -c
 INSTALL_DATA  =  @INSTALL_DATA@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM  =  @INSTALL_PROGRAM@
@@ -197,7 +215,6 @@ SHLIB.cc=     $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
 U_IS_BIG_ENDIAN = @U_IS_BIG_ENDIAN@
 includedir = @includedir@
 infodir = @infodir@
-ld_rpath_suf = @ld_rpath_suf@
 localstatedir = @localstatedir@
 mandir = @mandir@
 oldincludedir = @oldincludedir@
@@ -214,8 +231,6 @@ INSTALL-L = ${INSTALL_DATA}
 #
 ##################################################################
 
-pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
-pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
 
 # The basename of the ICU data file (i.e. icudt21b )
 ICUDATA_CHAR = @ICUDATA_CHAR@
@@ -264,6 +279,13 @@ GENCCODE_ASSEMBLY = @GENCCODE_ASSEMBLY@
 # The mh- file ("make fragment") for the platform is included here. 
 # It may override the above settings.
 # It is put last so that the mh-file can override anything.
+# 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#