blob: 2ff6418a3a3499b9abad5729c523a9c4ab1e3170 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 8eee2e2b910c6c3d837a4708d4d5d3d80afd8ef9 Mon Sep 17 00:00:00 2001
From: Arsen Arsenović <arsen@gentoo.org>
Date: Sat, 4 Nov 2023 00:20:05 +0100
Subject: [PATCH] Append '-vanilla' to pkgdatadir
---
Makefile.am | 3 +++
Makefile.in | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 28bb494..dfc8932 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,9 @@
ACLOCAL_AMFLAGS = -I m4
+# Work around file conflicts against sys-devel/autoconf -- Arsen
+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
+
## All of these will be incrementally updated later, here or in included
## makefile fragments.
ETAGS_ARGS =
diff --git a/Makefile.in b/Makefile.in
index 2cde4d0..cf17242 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,7 +197,6 @@ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
am__rm_f = rm -f $(am__rm_f_notfound)
am__rm_rf = rm -rf $(am__rm_f_notfound)
-pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -401,6 +400,8 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
distcleancheck_listfiles = \
find . \( -type f -a \! \
\( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
+# Work around file conflicts against sys-devel/autoconf -- Arsen
+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
--
2.42.0
|
