diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 1999-05-01 08:09:05 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 1999-05-01 08:09:05 +0000 |
| commit | b5dd10f8b1305bdfd10a50c4c6c97cfff33d82bc (patch) | |
| tree | a9dc8d0f23f062d28e13fa21b3d4aa72b672c0c7 /astro/xglobe/files | |
| parent | maintainer timeout (diff) | |
Chase the checksum (trivial readme file changes)
Diffstat (limited to 'astro/xglobe/files')
| -rw-r--r-- | astro/xglobe/files/patch-aa | 122 |
1 files changed, 42 insertions, 80 deletions
diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index e9ed2d66a237..cc58d99650a7 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -1,80 +1,42 @@ -*** Makefile.orig Wed Jan 20 06:02:59 1999 ---- Makefile Wed Jan 20 21:59:45 1999 -*************** -*** 4,40 **** - - ####### Installation directory - -! XGLOBE_DIR = /usr/local -! 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 - -! QT_LIB_DIR = /usr/lib/qt/lib - X11_LIB_DIR = /usr/X11R6/lib - - - ####### Compiler and tools - -! CPP = g++ -! LINK = g++ - MOC = moc - INSTALL = install - - ####### compile and link options - -! CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -O2 -Wall -! - LFLAGS = - - INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) - - LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) - -! #LIBS = -lX11 -lqt -lm - # If you want to use the QImageIO lib (to support jpg and png maps) use this - # line and comment the one above (don't forget to edit config.h as well!) - #LIBS = -lX11 -lqt -lm -lqimgio ---- 4,41 ---- - - ####### Installation directory - -! XGLOBE_DIR = ${PREFIX} -! 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/X11R6/include/X11/qt - -! QT_LIB_DIR = /usr/X11R6/lib - X11_LIB_DIR = /usr/X11R6/lib - - - ####### Compiler and tools - -! CXX ?= g++ -! CPP = ${CXX} -! LINK = ${CXX} - MOC = moc - INSTALL = install - - ####### compile and link options - -! CFLAGS ?= -O2 -pipe -! CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -Wall - LFLAGS = - - INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) - - LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) - -! LIBS = -lX11 -lqt -lm - # If you want to use the QImageIO lib (to support jpg and png maps) use this - # line and comment the one above (don't forget to edit config.h as well!) - #LIBS = -lX11 -lqt -lm -lqimgio +--- 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 = + |