diff options
| author | rillig <rillig@pkgsrc.org> | 2007-05-31 04:22:10 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-05-31 04:22:10 +0000 |
| commit | 5194fa2643dacea6a9ce3550d45f24e1e9a09802 (patch) | |
| tree | 89a869520cf1534496e20283c28e81d412468c2d /net/ser/patches | |
| parent | 1f68031a067c90fe6d77a7fe873cb96d0404d288 (diff) | |
| download | pkgsrc-5194fa2643dacea6a9ce3550d45f24e1e9a09802.tar.gz | |
In pkgsrc, the directory layout does not depend on the operating system.
Diffstat (limited to 'net/ser/patches')
| -rw-r--r-- | net/ser/patches/patch-aa | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/net/ser/patches/patch-aa b/net/ser/patches/patch-aa index 7a645a22854..5f75f6921d1 100644 --- a/net/ser/patches/patch-aa +++ b/net/ser/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2007/05/31 04:22:10 rillig Exp $ ---- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000 -+++ Makefile.defs +--- Makefile.defs.orig 2004-07-27 13:38:33.000000000 +0200 ++++ Makefile.defs 2007-05-31 06:17:16.000000000 +0200 @@ -77,7 +77,7 @@ prefix = $(PREFIX) BASEDIR ?= basedir = $(BASEDIR) @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ bin-prefix = $(basedir)$(prefix) modules-prefix = $(basedir)$(prefix) doc-prefix = $(basedir)$(prefix) -@@ -85,7 +85,8 @@ man-prefix = $(basedir)$(prefix) +@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix) ut-prefix = $(basedir)$(prefix) # dirs @@ -20,8 +20,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ +eg-dir = $(EGDIR)/ bin-dir = sbin/ modules-dir = lib/ser/modules/ ++ifeq (1, 1) ++ doc-dir = share/doc/ser ++ man-dir = $(PKGMANDIR) ++else ifeq ($(OS), linux) -@@ -104,6 +105,10 @@ ifeq ($(OS), netbsd) + doc-dir = share/doc/ser/ + man-dir = share/man/ +@@ -104,6 +109,10 @@ ifeq ($(OS), netbsd) doc-dir = share/doc/ser man-dir = man/ else @@ -32,11 +38,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ ifeq ($(OS), darwin) doc-dir = share/doc/ser/ man-dir = man/ -@@ -115,9 +120,10 @@ endif +@@ -115,9 +124,11 @@ endif endif endif endif +endif ++endif ut-prefix = bin/ # target dirs for various stuff -cfg-target = $(prefix)/$(cfg-dir) @@ -44,7 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ modules-target = $(prefix)/$(modules-dir) -@@ -133,10 +139,10 @@ endif +@@ -133,10 +144,10 @@ endif INSTALL-TOUCH = touch # used to create the file first (good to # make solaris install work) # INSTALL-CFG = $(INSTALL) -m 644 @@ -59,7 +66,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ #set some vars from the environment (and not make builtins) CC := $(shell echo "$${CC}") -@@ -639,6 +645,7 @@ ifeq ($(CC_NAME), suncc) +@@ -639,6 +650,7 @@ ifeq ($(CC_NAME), suncc) endif endif #mode=release @@ -67,7 +74,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ #*FLAGS used for compiling the modules -@@ -743,6 +750,19 @@ ifeq ($(OS), netbsd) +@@ -743,6 +755,19 @@ ifeq ($(OS), netbsd) LIBS= -lfl endif |