summaryrefslogtreecommitdiff
path: root/wm/ion/patches/patch-an
blob: 6a4a335341ae9ef7a4b2d6e9b5c5af556e778597 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
$NetBSD: patch-an,v 1.1 2008/02/27 22:31:52 jlam Exp $

--- ion/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
+++ ion/Makefile
@@ -21,17 +21,17 @@ LIBS += $(LTDL_LIBS)
 EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
 EXT_OBJS += ../libtu/libtu.a
 
-DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
-           -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
-	   -DLCDIR=\"$(LCDIR)\"
+DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
+           -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
+	   -DLCDIR=\"$(INST_LCDIR)\"
 
 CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
 
 ifeq ($(PRELOAD_MODULES),1)
 LDFLAGS += $(foreach mod, $(MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
-LINKOPTS = -R$(MODULEDIR)
+LINKOPTS = -R$(INST_MODULEDIR)
 else
-LINKOPTS = -export-dynamic -R$(MODULEDIR)
+LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
 endif
 
 SOURCES=ion.c