15d5ee526d
* minor bugfixes (zoomed windows are now correctly initialized) Pkgsrc: * now installs correctly (not to /usr/X11R6)
65 lines
1.9 KiB
Text
65 lines
1.9 KiB
Text
$NetBSD: patch-af,v 1.13 2006/01/06 22:36:19 adam Exp $
|
|
|
|
--- Local.config.orig 2005-04-30 23:33:14.000000000 +0200
|
|
+++ Local.config
|
|
@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2
|
|
XCOMM Local customization
|
|
|
|
DESTDIR =
|
|
-SHAREDIR = /usr/share/xpaint
|
|
+SHAREDIR = @PREFIX@/share/xpaint
|
|
|
|
XCOMM Printing system defaults
|
|
PRINT_COMMAND = lpr
|
|
@@ -70,6 +70,9 @@ XCOMM #endif
|
|
|
|
#ifdef NetBSDArchitecture
|
|
ARCH_DEFINES = -DHAVE_PARAM_H
|
|
+#ifdef arm32Architecture
|
|
+CDEBUGFLAGS =
|
|
+#endif
|
|
#endif
|
|
|
|
#ifdef OS2Architecture
|
|
@@ -132,11 +135,11 @@ XCOMM
|
|
XCOMM You must have the XPM library.
|
|
XCOMM Make sure the path name to the library is correct.
|
|
|
|
-XPM_LIB = -L/usr/X11R6/lib -lXpm
|
|
+XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm
|
|
|
|
XCOMM Make sure this points to the location of the 'xpm.h' file.
|
|
|
|
-XPM_INCLUDE = -I/usr/X11R6/include/X11
|
|
+XPM_INCLUDE = -I@XPMDIR@/include/X11
|
|
|
|
|
|
DEPENDFLAGS = -I./bitmaps
|
|
@@ -162,20 +165,11 @@ XCOMM CDEBUGFLAGS =
|
|
|
|
XCOMM This should take care of everything needed for BSD.
|
|
|
|
-#if defined(NetBSDArchitecture) || defined(BSD386Architecture)
|
|
ARCH_DEFINES = -DHAVE_PARAM_H
|
|
-TIFF_INCLUDE = -I/usr/local/include
|
|
-TIFF_LIB = -L/usr/local/lib -ltiff
|
|
-JPEG_INCLUDE = -I/usr/local/include
|
|
-JPEG_LIB = -L/usr/local/lib -ljpeg
|
|
-XPM_INCLUDE = -I/usr/X11R6/include/X11
|
|
-#endif
|
|
-
|
|
-#if defined(FreeBSDArchitecture)
|
|
-ARCH_DEFINES = -DHAVE_PARAM_H
|
|
-TIFF_INCLUDE = -I/usr/local/include/tiff34
|
|
-TIFF_LIB = -L/usr/local/lib -ltiff34
|
|
-JPEG_INCLUDE = -I/usr/local/include
|
|
-JPEG_LIB = -L/usr/local/lib -ljpeg
|
|
-XPM_INCLUDE = -I/usr/X11R6/include/X11
|
|
-#endif
|
|
+TIFF_INCLUDE = -I@LOCALBASE@/include
|
|
+TIFF_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff
|
|
+JPEG_INCLUDE = -I@LOCALBASE@/include
|
|
+JPEG_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ljpeg
|
|
+PNG_INCLUDE = -I@LOCALBASE@/include/png
|
|
+PNG_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -lpng -lz
|
|
+XPM_INCLUDE = -I@XPMDIR@/include/X11
|