diff options
Diffstat (limited to 'sys-devel/autoconf-vanilla/files')
| -rw-r--r-- | sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch (renamed from sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch) | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch index 2ff6418a3a34..b90864eacecb 100644 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch @@ -1,15 +1,15 @@ -From 8eee2e2b910c6c3d837a4708d4d5d3d80afd8ef9 Mon Sep 17 00:00:00 2001 -From: Arsen Arsenović <arsen@gentoo.org> -Date: Sat, 4 Nov 2023 00:20:05 +0100 +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 | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) + Makefile.in | 4 +++- + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 28bb494..dfc8932 100644 +index 1db714b..cb0650a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,9 @@ @@ -23,26 +23,27 @@ index 28bb494..dfc8932 100644 ## makefile fragments. ETAGS_ARGS = diff --git a/Makefile.in b/Makefile.in -index 2cde4d0..cf17242 100644 +index e5b3da5..04a3732 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -197,7 +197,6 @@ am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +@@ -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)) - 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 +@@ -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.42.0 +2.43.0 |