organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 15:05:53 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-630 rpath control

Browse source 
X-SVN-Rev: 2723
This commit is contained in:
Yves Arrouye 2000-10-17 23:28:41 +00:00
parent 8cc7ad4f93
commit a63e51a9bb
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/Makefile.in
View file

@ -76,7 +76,11 @@ DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(pkgdatadir)/$(VERSION)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@
ENABLE_RPATH = @ENABLE_RPATH@
ifeq ($(ENABLE_RPATH),YES)
RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
endif
LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
LIBS = @LIBS@
# Data packaging options are set at configure time with --with-data-packaging.

8
icu4c/source/config/Makefile.inc.in
View file

@ -2,7 +2,7 @@
#******************************************************************************
# Copyright (C) 1999, International Business Machines
# Corporation and others. All Rights Reserved.
# $Revision: 1.12 $
# $Revision: 1.13 $
#******************************************************************************
# This Makefile is designed to be included into projects which make use
# of the ICU.
@ -14,7 +14,11 @@ CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(prefix)/include
CXXFLAGS = @CXXFLAGS@
FFLAGS = @FFLAGS@
DEFS = @DEFS@
LDFLAGS = @LDFLAGS@ -L$(prefix)/lib $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
ENABLE_RPATH = @ENABLE_RPATH@
ifeq ($(ENABLE_RPATH),YES)
RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
endif
LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
LIBS = @LIBS@
ICUPREFIX = icu
ICULIBS = $(LIBS) -l$(ICUPREFIX)uc -l$(ICUPREFIX)i18n