X11BASEINST needs the special handling on NetBSD and not X11BASE.
xpkgwedge works again.
This commit is contained in:
parent
d2b9f2e432
commit
561669f4cc
2 changed files with 24 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
|||
$NetBSD: patch-sum,v 1.6 2001/02/13 21:45:07 tron Exp $
|
||||
$NetBSD: patch-sum,v 1.7 2001/02/17 22:04:17 veego Exp $
|
||||
|
||||
MD5 (patch-aa) = 7549ee363a0013d91d3c913581a026ef
|
||||
MD5 (patch-aa) = 1f6d1571ccd5dc0e4719318f68b3a411
|
||||
MD5 (patch-ab) = 5d22d3e8eb7fb13c85195e7f81a670e0
|
||||
MD5 (patch-ac) = 5ec2ba94ef44c7a129fa1c1aa08ca836
|
||||
|
|
|
@ -1,8 +1,26 @@
|
|||
$NetBSD: patch-aa,v 1.3 2001/02/13 21:45:07 tron Exp $
|
||||
$NetBSD: patch-aa,v 1.4 2001/02/17 22:04:17 veego Exp $
|
||||
|
||||
--- Makefile.orig Mon Feb 12 23:08:59 2001
|
||||
+++ Makefile Tue Feb 13 22:42:19 2001
|
||||
@@ -24,15 +24,6 @@
|
||||
+++ Makefile Sat Feb 17 22:47:49 2001
|
||||
@@ -4,13 +4,14 @@
|
||||
|
||||
HAVE_XFREE86 = YES
|
||||
|
||||
+X11BASE ?= /usr/X11R6
|
||||
+
|
||||
ifneq ($(X11PREFIX),) # NetBSD
|
||||
-X11BASE ?= $(X11PREFIX)
|
||||
+X11BASEINST ?= $(X11PREFIX)
|
||||
else
|
||||
-X11BASE ?= /usr/X11R6
|
||||
+X11BASEINST ?= $(X11BASE)
|
||||
endif
|
||||
|
||||
-X11BASEINST ?= $(X11BASE)
|
||||
LOCALBASE ?= /usr/local
|
||||
DEBUG = NO
|
||||
OS = $(shell uname -s)
|
||||
@@ -24,15 +25,6 @@
|
||||
override SHELL = /bin/sh
|
||||
|
||||
#
|
||||
|
@ -18,7 +36,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/13 21:45:07 tron Exp $
|
|||
# OpenBSD stuff
|
||||
#
|
||||
ifeq ($(OS),OpenBSD)
|
||||
@@ -71,6 +62,15 @@
|
||||
@@ -71,6 +63,15 @@
|
||||
endif
|
||||
|
||||
override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
|
||||
|
|
Loading…
Reference in a new issue