diff options
Diffstat (limited to 'sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch')
| -rw-r--r-- | sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch deleted file mode 100644 index b90864eacecb..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca78a8d7d653ac8199fa0346a814289ed7aef960 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 | 4 +++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1db714b..cb0650a 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 e5b3da5..04a3732 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@ -@@ -398,6 +397,9 @@ distuninstallcheck_listfiles = find . -type f -print - am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -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.43.0 - |