diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 1999-05-09 03:37:16 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 1999-05-09 03:37:16 +0000 |
| commit | 175346b1a6501c7c618fbb4e4a9742eb0ef22517 (patch) | |
| tree | ef50942ed6dcba43791f14a516aa48d3380413bc /astro | |
| parent | Switch to using tk8.0 (diff) | |
Port include files go under /usr/X11R6/include, not /usr/X11R6/share/include
I have no idea why my X installation has a hardlink from the former to the
latter.
Obtained from: bento
Notes
Notes:
svn path=/head/; revision=18624
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/xglobe/files/patch-aa | 65 |
1 files changed, 23 insertions, 42 deletions
diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index cc58d99650a7..673f98f72caf 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -1,42 +1,23 @@ ---- Makefile.orig Mon Apr 19 18:51:04 1999 -+++ Makefile Sat May 1 17:17:30 1999 -@@ -4,29 +4,31 @@ - - ####### Installation directory - --XGLOBE_DIR = /usr/local -+XGLOBE_DIR = $(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 --QT_INCLUDE_DIR = /usr/lib/qt/include -+X11_INCLUDE_DIR = $(X11BASE)/include -+QT_INCLUDE_DIR = $(X11BASE)/share/include/X11/qt - --QT_LIB_DIR = /usr/lib/qt/lib --X11_LIB_DIR = /usr/X11R6/lib -+QT_LIB_DIR = $(X11BASE)/lib -+X11_LIB_DIR = $(X11BASE)/lib - - - ####### Compiler and tools - --CPP = g++ --LINK = g++ -+CXX ?= g++ -+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 - - LFLAGS = - +Index: patches/patch-aa +=================================================================== +RCS file: /home/ncvs/ports/astro/xglobe/patches/patch-aa,v +retrieving revision 1.2 +diff -u -r1.2 patch-aa +--- patch-aa 1999/05/01 08:09:05 1.2 ++++ patch-aa 1999/05/09 03:27:50 +@@ -1,5 +1,5 @@ + --- Makefile.orig Mon Apr 19 18:51:04 1999 +-+++ Makefile Sat May 1 17:17:30 1999 +++++ Makefile Sun May 9 12:57:37 1999 + @@ -4,29 +4,31 @@ + + ####### Installation directory +@@ -14,7 +14,7 @@ + -X11_INCLUDE_DIR = /usr/X11R6/include + -QT_INCLUDE_DIR = /usr/lib/qt/include + +X11_INCLUDE_DIR = $(X11BASE)/include +-+QT_INCLUDE_DIR = $(X11BASE)/share/include/X11/qt +++QT_INCLUDE_DIR = $(X11BASE)/include/X11/qt + + -QT_LIB_DIR = /usr/lib/qt/lib + -X11_LIB_DIR = /usr/X11R6/lib |