blob: 1f53b69404196650fdd0b1cfc39dc579b305e766 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:32 wiz Exp $
--- Common.tmpl.dist.orig 1999-05-30 21:43:52.000000000 +0000
+++ Common.tmpl.dist
@@ -9,12 +9,12 @@
* CHIMERA_LIBDIR - configuration files. someday.
* CHIMERA_MANDIR - directory to hold the outdated man page.
*/
-/*
-CHIMERA_PREFIX = /usr/local
+
+CHIMERA_PREFIX = @@PREFIX@@
CHIMERA_BINDIR = $(CHIMERA_PREFIX)/bin
-CHIMERA_LIBDIR = $(CHIMERA_PREFIX)/lib/chimera
-CHIMERA_MANDIR = $(CHIMERA_PREFIX)/man
-*/
+CHIMERA_LIBDIR = $(CHIMERA_PREFIX)/share/chimera
+CHIMERA_MANDIR = $(MANDIR)
+
#if !defined(__QNX__)
LIBPRE=lib
@@ -35,22 +35,22 @@ IMGLEXT = _local
*/
/* Uncomment and modify if you have the JPEG 6 library */
-/*
+
#define Use_JPEG
-JPEGDIR = /usr/local
+JPEGDIR = @@LOCALBASE@@
JPEGINCLUDE = -I$(JPEGDIR)/include
-JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT)
+JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT) -Wl,-R$(JPEGDIR)/lib
JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg$(IMGLEXT).a
-*/
+
/* Uncomment and modify if you have the PNG library */
-/*
+
#define Use_PNG
-PNGDIR = /usr/local
+PNGDIR = @@LOCALBASE@@
PNGINCLUDE = -I$(PNGDIR)/include
-PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT)
-PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
-*/
+PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib
+PNGDEPLIB = $(PNGDIR)/lib/libpng14$(IMGLEXT).a
+
/* Tells Imakefile to set the flags for debugging. Comment for -O. */
#define CDebugging 1
@@ -119,6 +119,7 @@ OS_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRI
-DHAVE_UNAME -DHAVE_MKTIME -DHAVE_SIZE_T -DHAVE_SSIZE_T \
-DHAVE_STDARG_H -DHAVE_SNPRINTF
OS_LIBS =
+OS_LDFLAGS = -Wl,-R@@X11BASE@@/lib
#define CConfigSet 1
#endif
|