pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/libiconv Move including the ../../mk/bsd.pr...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa8d7d4cebb9
branches:  trunk
changeset: 480175:aa8d7d4cebb9
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Aug 31 19:24:42 2004 +0000

description:
Move including the ../../mk/bsd.prefs.mk and checking for Linux
to after GNU_CONFIGURE and USE_LIBTOOL being set.
This fixes the problem where the lt_cv_sys_max_cmd_len was not
added to the CONFIGURE_ENV.

Now that I think about it, I caused this problem when I added that
Linux check...

diffstat:

 converters/libiconv/Makefile |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 6546b79a18d0 -r aa8d7d4cebb9 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Tue Aug 31 19:12:34 2004 +0000
+++ b/converters/libiconv/Makefile      Tue Aug 31 19:24:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/06/04 05:25:38 reed Exp $
+# $NetBSD: Makefile,v 1.28 2004/08/31 19:24:42 reed Exp $
 #
 
 DISTNAME=              libiconv-1.9.1
@@ -10,12 +10,6 @@
 HOMEPAGE=              http://www.gnu.org/software/libiconv/
 COMMENT=               Character set conversion library
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Linux"
-# don't use PKG_SKIP_REASON yet so we can make sure the buildlinking is correct
-PKG_FAIL_REASON+=      "${PKGNAME} is not needed for Linux; it is included in GNU libc."
-.endif
-
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=                YES
@@ -23,6 +17,12 @@
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+# don't use PKG_SKIP_REASON yet so we can make sure the buildlinking is correct
+PKG_FAIL_REASON+=      "${PKGNAME} is not needed for Linux; it is included in GNU libc."
+.endif
+
 TEST_TARGET=           check
 
 EGDIR=                 ${PREFIX}/share/examples/libiconv



Home | Main Index | Thread Index | Old Index