diff options
| author | Chris Piazza <cpiazza@FreeBSD.org> | 1999-08-27 23:12:33 +0000 |
|---|---|---|
| committer | Chris Piazza <cpiazza@FreeBSD.org> | 1999-08-27 23:12:33 +0000 |
| commit | 267d5e83f7db0f30be6d29c6e2d53d4e9b009169 (patch) | |
| tree | fe74f572046fe6be54565700274b0339599bf9e8 /astro/xglobe/files | |
| parent | 0edcafaa5faea5eb2777d046f379e7df39aa9189 (diff) | |
Notes
Diffstat (limited to 'astro/xglobe/files')
| -rw-r--r-- | astro/xglobe/files/patch-aa | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index ef51696f33ba..6ed7ce48b2f5 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -1,22 +1,23 @@ ---- Makefile.orig Mon Apr 19 18:51:04 1999 -+++ Makefile Sun May 9 12:57:37 1999 -@@ -4,29 +4,31 @@ +--- Makefile.orig Mon Jul 19 05:56:27 1999 ++++ Makefile Fri Aug 27 16:06:08 1999 +@@ -4,29 +4,30 @@ ####### Installation directory -XGLOBE_DIR = /usr/local +-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe +XGLOBE_DIR = $(PREFIX) - XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe ++XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/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 +-QT_INCLUDE_DIR = $(QTDIR)/include +X11_INCLUDE_DIR = $(X11BASE)/include +QT_INCLUDE_DIR = $(X11BASE)/include/X11/qt --QT_LIB_DIR = /usr/lib/qt/lib +-QT_LIB_DIR = $(QTDIR)/lib -X11_LIB_DIR = /usr/X11R6/lib +QT_LIB_DIR = $(X11BASE)/lib +X11_LIB_DIR = $(X11BASE)/lib @@ -26,17 +27,16 @@ -CPP = g++ -LINK = g++ -+CXX ?= g++ -+CPP = $(CXX) -+LINK = $(CXX) ++CXX ?= c++ ++CPP = ${CXX} ++LINK = ${CXX} MOC = moc INSTALL = install ####### compile and link options --CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -O2 -Wall -+CFLAGS ?= -O2 -+CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -Wall +-CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall ++CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) LFLAGS = |