summaryrefslogtreecommitdiff
path: root/x11/xglobe/patches/patch-aa
blob: 9d598aeae6f34e0d45a5f26c7049084206772a6f (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
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
$NetBSD: patch-aa,v 1.6 2000/03/28 00:09:24 dmcmahill Exp $

--- Makefile.orig	Mon Apr 19 05:21:04 1999
+++ Makefile	Wed Mar 22 16:07:59 2000
@@ -5,15 +5,15 @@
 ####### Installation directory
 
-XGLOBE_DIR     = /usr/local
-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
+XGLOBE_DIR     = ${PREFIX}
+XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/X11/xglobe
 XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
 
 ####### Library directories - you may need to modify these
 
-X11_INCLUDE_DIR = /usr/X11R6/include
-QT_INCLUDE_DIR  = /usr/lib/qt/include
+X11_INCLUDE_DIR = ${X11BASE}/include
+QT_INCLUDE_DIR  = $(QTDIR)/include
 
-QT_LIB_DIR      = /usr/lib/qt/lib
-X11_LIB_DIR     = /usr/X11R6/lib
+QT_LIB_DIR      = $(QTDIR)/lib
+X11_LIB_DIR     = ${X11BASE}/lib
 
 
@@ -22,6 +22,6 @@
 CPP     = g++
 LINK    = g++
-MOC     = moc
-INSTALL = install
+MOC     = ${QTDIR}/bin/moc
+INSTALL = install -c
 
 ####### compile and link options
@@ -33,7 +33,7 @@
 INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)
 
-LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
+LIB_DIRS     = -L$(QT_LIB_DIR) -Wl,-R${QT_LIB_DIR} -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
 
-LIBS         = -lX11 -lqt -lm
+LIBS         = -lX11 -lqt -lm
 # If you want to use the QImageIO lib (to support jpg and png maps) use this
 # line and comment the one above (don't forget to edit config.h as well!)
@@ -41,4 +41,5 @@
 # If the linker complains about unresolved references try this:
 #LIBS         = -lX11 -lqt -lm -lqimgio -lpng -lz
+LIBS	= -lqt -lm -lXext -lX11
 
 ####### Target