66f5fb9197
* More automatic handling of date and time with the 'datematic' * 64-bit platform support * Various other new features, improvements, and bugfixes
61 lines
2.1 KiB
Text
61 lines
2.1 KiB
Text
$NetBSD: patch-aa,v 1.8 2005/02/08 09:40:35 adam Exp $
|
|
|
|
--- Makefile.orig 2005-02-03 21:17:43.000000000 +0000
|
|
+++ Makefile
|
|
@@ -26,7 +26,7 @@
|
|
|
|
|
|
# defaults..
|
|
-CC = gcc
|
|
+#CC = gcc
|
|
PLATFORM = UNIX
|
|
RMCOM = rm -f
|
|
XOBJ = x11.o interact.o
|
|
@@ -42,8 +42,8 @@ EXE = pl
|
|
#############################################################
|
|
|
|
#### For Linux uncomment the following.. #######################
|
|
-XLIBS = -L/usr/X11R6/lib -lX11
|
|
-INCLUDEDIRS = -I/usr/X11R6/include
|
|
+#XLIBS = -L/usr/X11R6/lib -lX11
|
|
+#INCLUDEDIRS = -I/usr/X11R6/include
|
|
|
|
#### Note: for 64 bit platform I used: XLIBS = -L/usr/X11R6/lib64
|
|
|
|
@@ -159,11 +159,11 @@ ZFLAG = -DWZ
|
|
#### For JPEG, WBMP, PNG, and FreeType2, using your copy of GD 1.84+, ######
|
|
#### uncomment the following.. (gd 1.84+, libpng, zlib, libjpeg, libfreetype ######
|
|
#### are all required). Set GDFONTPATH to directory containing .ttf files ######
|
|
-# ploticus: plgd18
|
|
-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
|
|
-# GD18H =
|
|
-# GDFREETYPE = -DGDFREETYPE
|
|
-# ZFLAG = -DWZ
|
|
+ploticus: plgd18
|
|
+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
|
|
+GD18H =
|
|
+GDFREETYPE = -DGDFREETYPE
|
|
+ZFLAG = -DWZ
|
|
|
|
|
|
#### To disable all GD image support uncomment the following.. ######################
|
|
@@ -197,6 +197,7 @@ BIN = /usr/local/bin
|
|
#### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
|
|
#### This option not available for win32
|
|
# PREFABS_DIR = "/usr/lib/ploticus"
|
|
+PREFABS_DIR = "${PREFIX}/share/ploticus"
|
|
|
|
|
|
#### For LOCALE support (non-roman alphabets & collation), uncomment the following..
|
|
@@ -258,9 +259,9 @@ GD16 = grgd16.o devstuff16.o gd16.o gd_i
|
|
GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o
|
|
|
|
|
|
-LIBS = $(XLIBS) -lm $(ADDLIBS)
|
|
+LIBS = ${LDFLAGS} $(XLIBS) -lm $(ADDLIBS)
|
|
|
|
-CFLAGS = $(WALL) -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
|
|
+CFLAGS += $(WALL) -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
|
|
$(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(INCLUDEDIRS) \
|
|
$(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
|
|
|