diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/XmHTML/patches/patch-aa | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/XmHTML/patches/patch-aa')
| -rw-r--r-- | x11/XmHTML/patches/patch-aa | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa index 88c49b9d660..fb02e9ff4f2 100644 --- a/x11/XmHTML/patches/patch-aa +++ b/x11/XmHTML/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:29 jlam Exp $ --- Makefile.orig Thu Feb 4 00:43:27 1999 +++ Makefile @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ -ZLIBINC = -IMAGEINCLUDES = $(ZLIBINC) +ZLIBINC = -+IMAGEINCLUDES = -I${BUILDLINK_DIR}/include $(ZLIBINC) ++IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC) # Image libraries # No need to add -lXpm if you need to include it with LIBS below @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ # Platform specific includes ifeq ($(PLATFORM),Motif) -PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include -+PLATFORMINC=-I../../include/XmHTML -I${BUILDLINK_X11_DIR}/include ++PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include else ifeq ($(PLATFORM),gtk) PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include @@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ ifeq ($(PLATFORM),Motif) -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${BUILDLINK_X11_DIR}/lib ++LIBDIR = -L${X11BASE}/lib # This is what is required under Linux (Motif 2.0.1). # Your mileage may vary. -LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ ifeq($(PLATFORM),gtk) -LIBDIR = -L/usr/local/lib -+LIBDIR = -L${BUILDLINK_X11_DIR}/lib ++LIBDIR = -L${X11BASE}/lib LIBS = -lgdk -lgtk -lX11 # endif gtk |