1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
freebsd-ports/astro/saoimage/files/patch-aa
Patrick Li 58fbd71d12 Update to 1.31.1
PR:		ports/41024
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
2002-07-27 02:36:06 +00:00

69 lines
2.4 KiB
Plaintext

--- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001
+++ makefile.FreeBSD Wed Jul 24 01:12:35 2002
@@ -36,9 +36,9 @@
# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
# the CFLAGS macro below.)
-SAOBINDIR = $(ROOT)/usr/local/bin/
-SAOMANDIR = $(ROOT)/usr/local/man/manl/
-IMTRCDIR = $(ROOT)/usr/local/lib/
+SAOBINDIR = $(ROOT)$(PREFIX)/bin/
+SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/
+IMTRCDIR = $(ROOT)$(PREFIX)/etc/
IMTOOLRC = $(IMTRCDIR)imtoolrc
FIFO_I = $(ROOT)/dev/imt1i
@@ -46,7 +46,7 @@
FIFO_LN = $(ROOT)/dev/imt1
# Compiler specification.
-CC = cc
+CC ?= cc
# Uncomment these two lines to compile with gcc (add any optimizers you wish).
#CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce
# Delayed branches could win big on RISC: many inner loops have branches
@@ -76,12 +76,12 @@
# OFLAGS: compiler optimization/debug options.
#OFLAGS = -g -DDEBUG
-OFLAGS = -O2 -m486 -pipe
+OFLAGS ?= -O2 -m486 -pipe
# ADFLAGS: architecture-dependent floating point flags, etc.
#ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users...
-ADFLAGS = -I/usr/X11R6/include
+ADFLAGS = -I${X11BASE}/include
# Libraries that move about or may require special specification.
#
@@ -89,7 +89,7 @@
# usual link search path, i.e., it is not in /usr/lib, it may be necessary
# to specify its path fully in XLIB.
-XLIB = -L/usr/X11R6/lib -lX11
+XLIB = -L${X11BASE}/lib -lX11
#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...
#F77LIB = -lF77 -lI77 -lU77
F77LIB = -lf2c
@@ -307,7 +307,7 @@
$(MAKE) ARCFILE=$(TAPEDEV) tar
-XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h
+XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h
STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
@@ -419,8 +419,8 @@
defs/dispbox.def defs/magnibox.def defs/panbox.def \
defs/btnbox.def defs/colorbox.def defs/graphbox.def \
defs/desktop.def defs/cursor.def
-mainkey.o : $(WORKS) /usr/include/X11/keysym.h \
- /usr/include/X11/keysymdef.h
+mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \
+ ${X11BASE}/include/X11/keysymdef.h
#mainkey.o : $(WORKS) # for OpenWindows
mainslct.o : $(WORKS)
mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h