diff options
| author | tron <tron> | 2001-10-05 10:02:53 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-10-05 10:02:53 +0000 |
| commit | e19310719f171999c20dd887950ed77ef1763e78 (patch) | |
| tree | 18762881c475c884708b53f6b711860e1b5f0a08 /textproc/jade | |
| parent | ec5be45cd17302284748a4b4d7a4ce7f9937873e (diff) | |
| download | pkgsrc-e19310719f171999c20dd887950ed77ef1763e78.tar.gz | |
Resolve CVS conflict in this file.
Diffstat (limited to 'textproc/jade')
| -rw-r--r-- | textproc/jade/Makefile | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index 49678cb5618..8589cf3679c 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/04 18:56:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/05 10:02:53 tron Exp $ # FreeBSD Id: Makefile,v 1.15 1999/01/31 11:15:57 dirk Exp # @@ -16,18 +16,6 @@ COMMENT= Object-oriented SGML/XML parser toolkit and DSSSL engine CONFLICTS+= sp-[0-9]* -<<<<<<< Makefile -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -#USE_GMAKE= yes # prevent "'sx' is upto date" on install ? -LTCONFIG_OVERRIDE= \ - ${WRKSRC}/config/ltconfig - -CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" -CONFIGURE_ARGS= --disable-shared -CONFIGURE_ARGS+= --enable-default-catalog=${PREFIX}/share/sgml/jade/catalog -CONFIGURE_ARGS+= --enable-mif -======= USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes #USE_LIBINTL= yes @@ -39,7 +27,6 @@ JADE_CATALOG_DIR= ${PREFIX}/share/sgml/jade/catalog CONFIGURE_ARGS= --disable-shared CONFIGURE_ARGS+= --enable-default-catalog=${JADE_CATALOG_DIR} CONFIGURE_ARGS+= --enable-mif ->>>>>>> 1.11 CXXFLAGS+= ${CFLAGS} |