X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..cead9d4c898d4172af6769483c517e3bdb8be2bd:/icuSources/config/Makefile.inc.in

diff --git a/icuSources/config/Makefile.inc.in b/icuSources/config/Makefile.inc.in
index b8ce6a53..0eb37ab4 100644
--- a/icuSources/config/Makefile.inc.in
+++ b/icuSources/config/Makefile.inc.in
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 #******************************************************************************
-#   Copyright (C) 1999-2004, International Business Machines
+#   Copyright (C) 1999-2008, 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@
 
@@ -79,6 +80,18 @@ endif
 #SH# 	;;
 #SH#esac
 
+# Name flexibility for the library naming scheme.  Any modifications should
+# be made in the mh- file for the specific platform.
+DATA_STUBNAME = data
+COMMON_STUBNAME = uc
+I18N_STUBNAME = i18n
+LAYOUT_STUBNAME = le
+LAYOUTEX_STUBNAME = lx
+IO_STUBNAME = io
+TOOLUTIL_STUBNAME = tu
+CTESTFW_STUBNAME = test
+ 
+
 
 ### To link your application with ICU:
 # 1. use LDFLAGS, CFLAGS, etc from above
@@ -89,8 +102,8 @@ endif
 #    - $(ICULIBS_ICUIO)   - ICU stdio equivalent library
 
 ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_DATA   = -l$(ICUPREFIX)data$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_I18N   = -l$(ICUPREFIX)i18n$(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)
@@ -124,10 +137,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)
+
 ##################################################################
 ##################################################################
 #
@@ -151,8 +169,10 @@ 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)
+#SH#ARFLAGS="@ARFLAGS@ ${ARFLAGS}"
 CC = @CC@
 CFLAGS = @CFLAGS@ 
 CPP = @CPP@
@@ -162,7 +182,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@
@@ -182,7 +203,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@
@@ -199,10 +219,9 @@ 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@
 ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@
 
 # Defaults for pkgdata's mode and directories