diff options
| author | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
| commit | c67635060cd54b4f914d016d2d93bdcc9c66c834 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /www/apache6/Makefile | |
| parent | 78b14f7e1233ae26114a6875e6741dc02d74759f (diff) | |
| download | pkgsrc-c67635060cd54b4f914d016d2d93bdcc9c66c834.tar.gz | |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'www/apache6/Makefile')
| -rw-r--r-- | www/apache6/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 6f09603da0b..3b3d48340ad 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2004/04/30 05:25:59 snj Exp $ +# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -134,7 +134,7 @@ CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2" # on Solaris, we also need libdbm . if ${OPSYS} == "SunOS" CONFIGURE_ENV+= LIBS="-ldbm -ldb2" -LDFLAGS+= -Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib +LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/ucblib -L/usr/ucblib . else CONFIGURE_ENV+= LIBS="-ldb2" . endif |