blob: 879664f4096e3b749c20ae0742f95aa7958414ef (
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
|
From 0d784a60bb65eb730a1b5f2b24887192d058629b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org>
Date: Sat, 4 Nov 2023 00:32:48 +0100
Subject: [PATCH] Append '-vanilla' to pkgdatadir
---
Makefile.am | 3 +++
Makefile.in | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 17e1f8f..73d2ea7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,9 @@
ACLOCAL_AMFLAGS = -I m4
+# Work around file conflicts against dev-build/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 dcd27f7..704248f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,6 @@ am__make_running_with_option = \
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -401,6 +400,7 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
--
2.42.0
|
GitWeb
