$NetBSD: patch-aa,v 1.3 1999/01/20 20:24:11 hubertf Exp $ --- Makefile.orig Tue Jan 19 20:32:59 1999 +++ Makefile Wed Jan 20 21:00:00 1999 @@ -4,17 +4,17 @@ ####### 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 -QT_LIB_DIR = /usr/lib/qt/lib -X11_LIB_DIR = /usr/X11R6/lib +QT_LIB_DIR = $(QTDIR)/lib +X11_LIB_DIR = ${X11BASE}/lib ####### Compiler and tools @@ -22,7 +22,7 @@ CPP = g++ LINK = g++ MOC = moc -INSTALL = install +INSTALL = install -c ####### compile and link options @@ -32,7 +32,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) -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR) #LIBS = -lX11 -lqt -lm # If you want to use the QImageIO lib (to support jpg and png maps) use this @@ -40,6 +40,7 @@ #LIBS = -lX11 -lqt -lm -lqimgio # If the linker complains about unresolved references try this: #LIBS = -lX11 -lqt -lm -lqimgio -lpng -lz +LIBS = -lqt -lm -lXext -lX11 ####### Target