62 lines
1.7 KiB
Text
62 lines
1.7 KiB
Text
$NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache 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/libpng$(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
|
|
|