84 lines
2.0 KiB
Plaintext
84 lines
2.0 KiB
Plaintext
$OpenBSD: patch-system_mk,v 1.2 2001/03/15 10:09:26 obecian Exp $
|
|
--- system.mk.orig Mon Mar 5 08:16:01 2001
|
|
+++ system.mk Wed Mar 14 03:01:40 2001
|
|
@@ -7,13 +7,14 @@
|
|
## Installation paths
|
|
##
|
|
|
|
-PREFIX=/usr/local
|
|
+#PREFIX=/usr/local
|
|
|
|
# No need to modify these usually
|
|
BINDIR=$(PREFIX)/bin
|
|
-ETCDIR=$(PREFIX)/etc
|
|
+ETCDIR=$(SYSCONFDIR)
|
|
MANDIR=$(PREFIX)/man
|
|
-DOCDIR=$(PREFIX)/doc
|
|
+DOCDIR=$(PREFIX)/share/doc
|
|
+EXAMPLEDIR=$(PREFIX)/share/examples
|
|
# Not used
|
|
INCDIR=$(PREFIX)/include
|
|
LIBDIR=$(PREFIX)/lib
|
|
@@ -24,14 +25,14 @@
|
|
##
|
|
|
|
#MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
|
|
-MODULE_SUPPORT_LDFLAGS=-export-dynamic -ldl
|
|
+MODULE_SUPPORT_LDFLAGS=
|
|
|
|
|
|
##
|
|
## X libraries, includes and options
|
|
##
|
|
|
|
-X11_PREFIX=/usr/X11R6
|
|
+X11_PREFIX=$(X11BASE)
|
|
|
|
# SunOS/Solaris
|
|
#X11_PREFIX=/usr/openwin
|
|
@@ -52,14 +53,14 @@
|
|
# asprintf and vasprintf in the c library. (gnu libc has.)
|
|
# If HAS_SYSTEM_ASPRINTF is not defined, an implementation
|
|
# in sprintf_2.2/ is used.
|
|
-#HAS_SYSTEM_ASPRINTF=1
|
|
+HAS_SYSTEM_ASPRINTF=1
|
|
|
|
|
|
##
|
|
## C compiler
|
|
##
|
|
|
|
-CC=gcc
|
|
+#CC=gcc
|
|
|
|
# The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
|
|
# they're mainly for development use. So, if they cause trouble (not
|
|
@@ -68,7 +69,7 @@
|
|
|
|
# libtu/ uses POSIX_SOURCE
|
|
|
|
-POSIX_SOURCE=-ansi -D_POSIX_SOURCE
|
|
+#POSIX_SOURCE=-ansi -D_POSIX_SOURCE
|
|
|
|
# and . (ion) XOPEN_SOURCE.
|
|
# There is variation among systems what should be used and how they interpret
|
|
@@ -81,13 +82,13 @@
|
|
|
|
# Same as '-Wall -pedantic-errors' without '-Wunused' as callbacks often
|
|
# have unused variables.
|
|
-WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
|
|
- -Wtrigraphs -Wformat -Wchar-subscripts \
|
|
- -Wparentheses -pedantic-errors -Wuninitialized
|
|
+#WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
|
|
+# -Wtrigraphs -Wformat -Wchar-subscripts \
|
|
+# -Wparentheses -pedantic-errors -Wuninitialized
|
|
|
|
|
|
-CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
|
|
-LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
|
|
+CFLAGS+= $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
|
|
+LDFLAGS+= $(LIBS) $(EXTRA_LIBS)
|
|
|
|
|
|
##
|