85879d95a0
Install files properly, so that a "make install; make deinstall; make install" combination does the right thing. Bump PKGREVISION.
73 lines
1.6 KiB
Text
73 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $
|
|
|
|
--- Makefile.defs.orig 2002-11-12 17:21:28.000000000 +0000
|
|
+++ Makefile.defs 2003-09-16 15:42:29.000000000 +0100
|
|
@@ -16,7 +16,6 @@
|
|
-e s/armv4l/arm/)
|
|
|
|
# install location
|
|
-PREFIX = /usr/local
|
|
prefix = $(PREFIX)
|
|
# install path is $(basedir) $(prefix)
|
|
# example:
|
|
@@ -33,7 +32,7 @@
|
|
ut-prefix = $(basedir)$(prefix)
|
|
|
|
# dirs
|
|
-cfg-dir = etc/ser/
|
|
+cfg-dir = ser/
|
|
bin-dir = sbin/
|
|
modules-dir = lib/ser/modules/
|
|
ifeq ($(OS), linux)
|
|
@@ -45,7 +44,7 @@
|
|
endif
|
|
ut-prefix = bin/
|
|
# target dirs for various stuff
|
|
-cfg-target = $(prefix)/$(cfg-dir)
|
|
+cfg-target = $(PKG_SYSCONFDIR)/$(cfg-dir)
|
|
modules-target = $(prefix)/$(modules-dir)
|
|
|
|
|
|
@@ -59,10 +58,10 @@
|
|
endif
|
|
|
|
# INSTALL-CFG = $(INSTALL) -m 644
|
|
-INSTALL-BIN = $(INSTALL) -m 755
|
|
-INSTALL-MODULES = $(INSTALL) -m 755
|
|
-INSTALL-DOC = $(INSTALL) -m 644
|
|
-INSTALL-MAN = $(INSTALL) -m 644
|
|
+INSTALL-BIN = $(INSTALL) -c -m 755
|
|
+INSTALL-MODULES = $(INSTALL) -c -m 755
|
|
+INSTALL-DOC = $(INSTALL) -c -m 644
|
|
+INSTALL-MAN = $(INSTALL) -c -m 644
|
|
|
|
#set some vars from the environment (and not make builtins)
|
|
CC := $(shell echo "$${CC}")
|
|
@@ -446,6 +445,7 @@
|
|
endif
|
|
|
|
endif #mode=release
|
|
+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
|
|
|
|
|
|
#*FLAGS used for compiling the modules
|
|
@@ -473,8 +473,10 @@
|
|
DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN
|
|
endif
|
|
ifneq ($(OS), openbsd)
|
|
+ifneq ($(OS), netbsd)
|
|
DEFS+=-DHAVE_SCHED_YIELD
|
|
endif
|
|
+endif
|
|
|
|
|
|
#os specific stuff
|
|
@@ -520,7 +522,7 @@
|
|
ifeq ($(OS), netbsd)
|
|
DEFS+=-DHAVE_SOCKADDR_SA_LEN
|
|
YACC=yacc
|
|
- LIBS= -lfl -lc_r
|
|
+ LIBS= -lfl -lpthread
|
|
endif
|
|
|
|
ifneq (,$(findstring CYGWIN, $(OS)))
|