[BACK]Return to patch-ap CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / audio / dap / patches

File: [cvs.NetBSD.org] / pkgsrc / audio / dap / patches / patch-ap (download)

Revision 1.6, Sat Jul 4 16:18:28 2015 UTC (8 years, 3 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, HEAD
Changes since 1.5: +2 -2 lines

Remove USE_X11BASE and X11PREFIX.

$NetBSD: patch-ap,v 1.6 2015/07/04 16:18:28 joerg Exp $

--- tooltips/Makefile.netbsd.orig	2003-09-16 01:05:51.000000000 +0200
+++ tooltips/Makefile.netbsd
@@ -26,18 +26,20 @@
 VERSION = 0.02g
 
 # Define where the X11 include files are.
-X11_INCLUDE_DIR = /usr/X11R6/include
+X11_INCLUDE_DIR = ${X11BASE}/include
+OTHER_INCLUDE_DIR = ${LOCALBASE}/include/X11
+X11_BASE_INCLUDE= ${X11BASE}/include
 
 # Uncomment out this line if you do not want debug information included.
 # DEBUG = -g -Wall -ansi -pedantic
 DEBUG = 
 
 # Set the default optimisation
-OPTIM = -O1
+OPTIM = ${CFLAGS}
 
 # Define the utilities to use for compilation.
 CC         = gcc
-CCOPTS     = $(DEBUG) $(OPTIM) -I$(X11_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)/X11 -I$(OTHER_INCLUDE_DIR)
+CCOPTS     = $(DEBUG) $(OPTIM) -I$(X11_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)/X11 -I$(OTHER_INCLUDE_DIR) -I${X11_BASE_INCLUDE}
 AR         = ar
 AROPTS     = ruv
 SED        = sed