Mercurial > vanilla
changeset 669:97da3728a2f8
core/bash-completion: fix CMake config directory
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 31 Jul 2019 21:05:00 +0200 |
| parents | 0446aa20458f |
| children | ed3791383f29 |
| files | core/bash-completion/bash-completion.sh core/bash-completion/patch-Makefile.am.patch |
| diffstat | 2 files changed, 29 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/bash-completion/bash-completion.sh Wed Jul 31 21:05:00 2019 +0200 +++ b/core/bash-completion/bash-completion.sh Wed Jul 31 21:05:00 2019 +0200 @@ -29,9 +29,11 @@ tar xvf $PKGNAME-$PKGVERSION.tar.xz cd $PKGNAME-$PKGVERSION + patch -p0 < ../patch-Makefile.am.patch + autoreconf -vif ./configure --prefix= make - make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR + make DESTDIR=$DESTDIR install cd .. rm -rf $PKGNAME-$PKGVERSION
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/bash-completion/patch-Makefile.am.patch Wed Jul 31 21:05:00 2019 +0200 @@ -0,0 +1,26 @@ +--- Makefile.am.orig 2019-07-31 12:38:00.009407478 +0200 ++++ Makefile.am 2019-07-31 12:38:50.713409035 +0200 +@@ -8,10 +8,10 @@ + profiledir = $(sysconfdir)/profile.d + profile_DATA = bash_completion.sh + +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = /lib/pkgconfig + pkgconfig_DATA = bash-completion.pc + +-cmakeconfigdir = $(datadir)/cmake/$(PACKAGE)/ ++cmakeconfigdir = /lib/cmake/$(PACKAGE)/ + cmakeconfig_DATA = bash-completion-config.cmake \ + bash-completion-config-version.cmake + +@@ -29,8 +29,8 @@ + $(DESTDIR)$(pkgdatadir)/bash_completion > $$tmpfile && \ + cat $$tmpfile > $(DESTDIR)$(pkgdatadir)/bash_completion && \ + sed -e 's|\$${prefix}|$(prefix)|' \ +- $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake \ ++ $(DESTDIR)$(cmakeconfigdir)/bash-completion-config.cmake \ + > $$tmpfile && \ + cat $$tmpfile > \ +- $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake && \ ++ $(DESTDIR)$(cmakeconfigdir)/bash-completion-config.cmake && \ + rm $$tmpfile