1999-08-27 23:12:33 +00:00
|
|
|
--- Makefile.orig Mon Jul 19 05:56:27 1999
|
|
|
|
|
+++ Makefile Fri Aug 27 16:06:08 1999
|
|
|
|
|
@@ -4,29 +4,30 @@
|
1999-05-10 11:12:20 +00:00
|
|
|
|
|
|
|
|
####### Installation directory
|
|
|
|
|
|
|
|
|
|
-XGLOBE_DIR = /usr/local
|
1999-08-27 23:12:33 +00:00
|
|
|
-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
|
1999-05-10 11:12:20 +00:00
|
|
|
+XGLOBE_DIR = $(PREFIX)
|
1999-08-27 23:12:33 +00:00
|
|
|
+XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe
|
1999-05-10 11:12:20 +00:00
|
|
|
XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
|
|
|
|
|
|
|
|
|
|
####### Library directories - you may need to modify these
|
|
|
|
|
|
|
|
|
|
-X11_INCLUDE_DIR = /usr/X11R6/include
|
1999-08-27 23:12:33 +00:00
|
|
|
-QT_INCLUDE_DIR = $(QTDIR)/include
|
1999-05-10 11:12:20 +00:00
|
|
|
+X11_INCLUDE_DIR = $(X11BASE)/include
|
|
|
|
|
+QT_INCLUDE_DIR = $(X11BASE)/include/X11/qt
|
|
|
|
|
|
1999-08-27 23:12:33 +00:00
|
|
|
-QT_LIB_DIR = $(QTDIR)/lib
|
1999-05-10 11:12:20 +00:00
|
|
|
-X11_LIB_DIR = /usr/X11R6/lib
|
|
|
|
|
+QT_LIB_DIR = $(X11BASE)/lib
|
|
|
|
|
+X11_LIB_DIR = $(X11BASE)/lib
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
####### Compiler and tools
|
|
|
|
|
|
|
|
|
|
-CPP = g++
|
|
|
|
|
-LINK = g++
|
1999-08-27 23:12:33 +00:00
|
|
|
+CXX ?= c++
|
|
|
|
|
+CPP = ${CXX}
|
|
|
|
|
+LINK = ${CXX}
|
1999-05-10 11:12:20 +00:00
|
|
|
MOC = moc
|
|
|
|
|
INSTALL = install
|
|
|
|
|
|
|
|
|
|
####### compile and link options
|
|
|
|
|
|
1999-08-27 23:12:33 +00:00
|
|
|
-CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall
|
|
|
|
|
+CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO)
|
1999-05-10 11:12:20 +00:00
|
|
|
|
|
|
|
|
LFLAGS =
|
|
|
|
|
|
