fix installation directories to avoid prefix issues if we set mandir

separately.

No change in generated package.
This commit is contained in:
espie 2006-07-13 13:35:15 +00:00
parent 044eebec20
commit 086ed2a9a6
3 changed files with 25 additions and 15 deletions

View File

@ -1,10 +1,20 @@
$OpenBSD: patch-Makefile_rules_in,v 1.1 2003/05/18 07:40:55 naddy Exp $ $OpenBSD: patch-Makefile_rules_in,v 1.2 2006/07/13 13:35:15 espie Exp $
--- Makefile.rules.in.orig Fri May 16 23:21:04 2003 --- Makefile.rules.in.orig Sat Jan 20 02:51:53 2001
+++ Makefile.rules.in Fri May 16 23:21:18 2003 +++ Makefile.rules.in Thu Jul 13 15:32:24 2006
@@ -10,6 +10,7 @@ exec_prefix= $(DEST_DIR)@prefix@ @@ -5,11 +5,12 @@ VERSION = 2.0.4
BIN_DIR = @bindir@ DATE = Fri Jan 19 23:51:53 BRST 2001
LIB_DIR = @libdir@
MAN_DIR = @mandir@/man1 DEST_DIR=
-prefix = $(DEST_DIR)@prefix@
-exec_prefix= $(DEST_DIR)@prefix@
-BIN_DIR = @bindir@
-LIB_DIR = @libdir@
-MAN_DIR = @mandir@/man1
+prefix = @prefix@
+exec_prefix= @prefix@
+BIN_DIR = $(DEST_DIR)@bindir@
+LIB_DIR = $(DEST_DIR)@libdir@
+MAN_DIR = $(DEST_DIR)@mandir@/man1
+SYSCONF_DIR = @sysconfdir@ +SYSCONF_DIR = @sysconfdir@
CC = @CC@ CC = @CC@

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_player_Makefile,v 1.2 2003/12/30 02:18:50 espie Exp $ $OpenBSD: patch-src_player_Makefile,v 1.3 2006/07/13 13:35:16 espie Exp $
--- src/player/Makefile.orig 2001-01-15 12:35:23.000000000 +0100 --- src/player/Makefile.orig Mon Jan 15 12:35:23 2001
+++ src/player/Makefile 2003-12-29 22:49:51.000000000 +0100 +++ src/player/Makefile Wed Jul 12 17:10:42 2006
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
# Extended Module Player src/player/Makefile # Extended Module Player src/player/Makefile
# $Id: patch-src_player_Makefile,v 1.2 2003/12/30 02:18:50 espie Exp $ # $Id: patch-src_player_Makefile,v 1.3 2006/07/13 13:35:16 espie Exp $
-XCFLAGS = -I../include -XCFLAGS = -I../include
+XCFLAGS = -I../include -DSYSCONF_DIR=\"$(SYSCONF_DIR)\" +XCFLAGS = -I../include -DSYSCONF_DIR=\"$(SYSCONF_DIR)\"

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_xmms_Makefile,v 1.1 2004/06/13 06:11:53 pvalchev Exp $ $OpenBSD: patch-src_xmms_Makefile,v 1.2 2006/07/13 13:35:16 espie Exp $
--- src/xmms/Makefile.orig 2001-01-16 18:29:41.000000000 -0700 --- src/xmms/Makefile.orig Wed Jan 17 02:29:41 2001
+++ src/xmms/Makefile 2004-06-12 23:27:40.000000000 -0600 +++ src/xmms/Makefile Wed Jul 12 17:10:42 2006
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
# Extended Module Player src/xmms/Makefile # Extended Module Player src/xmms/Makefile
# $Id: patch-src_xmms_Makefile,v 1.1 2004/06/13 06:11:53 pvalchev Exp $ # $Id: patch-src_xmms_Makefile,v 1.2 2006/07/13 13:35:16 espie Exp $
-XCFLAGS = -I../include -DVERSION=\"$(VERSION)\" `xmms-config --cflags` -DXMMS_PLUGIN #-DDEBUG -XCFLAGS = -I../include -DVERSION=\"$(VERSION)\" `xmms-config --cflags` -DXMMS_PLUGIN #-DDEBUG
+XCFLAGS = -I../include -DVERSION=\"$(VERSION)\" `xmms-config --cflags` -DXMMS_PLUGIN -fPIC #-DDEBUG +XCFLAGS = -I../include -DVERSION=\"$(VERSION)\" `xmms-config --cflags` -DXMMS_PLUGIN -fPIC #-DDEBUG