47 lines
1.3 KiB
Text
47 lines
1.3 KiB
Text
$NetBSD: patch-aa,v 1.10 2009/07/07 17:47:26 joerg Exp $
|
|
|
|
--- Makefile.orig 1999-07-19 07:56:27.000000000 -0500
|
|
+++ Makefile 2003-11-14 12:31:20.000000000 -0600
|
|
@@ -4,25 +4,25 @@
|
|
|
|
####### Installation directory
|
|
|
|
-XGLOBE_DIR = /usr/local
|
|
+XGLOBE_DIR = ${DESTDIR}${PREFIX}
|
|
XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
|
|
XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
|
|
|
|
####### Library directories - you may need to modify these
|
|
|
|
-X11_INCLUDE_DIR = /usr/X11R6/include
|
|
+X11_INCLUDE_DIR = ${X11BASE}/include
|
|
QT_INCLUDE_DIR = $(QTDIR)/include
|
|
|
|
QT_LIB_DIR = $(QTDIR)/lib
|
|
-X11_LIB_DIR = /usr/X11R6/lib
|
|
+X11_LIB_DIR = ${X11BASE}/lib
|
|
|
|
|
|
####### Compiler and tools
|
|
|
|
CPP = g++
|
|
LINK = g++
|
|
-MOC = moc
|
|
-INSTALL = install
|
|
+MOC = ${QTDIR}/bin/moc
|
|
+INSTALL = install -c
|
|
|
|
####### compile and link options
|
|
|
|
@@ -32,9 +32,9 @@
|
|
|
|
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 = -lqt-mt -lm -lXext -lX11 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
|
|
# If you want to use the QImageIO lib (to support jpg and png maps) use the
|
|
# next two lines and comment the one above
|
|
#WITH_QIMGIO = -DWITH_QIMAGEIO
|