чување 30a3f3bbfb9b5c33c607b76c8b37c4986d228812 родитељ d967f2d15bbc005a8829790bf75357222f22786b Аутор: Страхиња Радић <contact@strahinja.org> Датум: Wed, 24 Aug 2022 19:29:44 +0200 Better way of fixing incorrect location of install Signed-off-by: Страхиња Радић <contact@strahinja.org> Diffstat:
| M | TODO | | | 3 | ++- |
| M | gmime/mkfile | | | 6 | +----- |
| M | xapian-core/mkfile | | | 7 | ++----- |
измењених датотека: 3, додавања: 5(+), брисања: 11(-)
diff --git a/TODO b/TODO @@ -1,8 +1,9 @@ TODO ==== -[ ] Investigate why is install sometimes incorrectly defined as ../install in +[x] Investigate why is install sometimes incorrectly defined as ../install in Makefiles + - Auto*hell crap; can be overridden by `make INSTALL=install install` [~] Add neomutt [~] Determine minimal set of dependencies to run Luke Smith's diff --git a/gmime/mkfile b/gmime/mkfile @@ -21,12 +21,8 @@ $PKGBASE:QV: make install:QV: $PKGBASE install-legal - # Fix Makefile (for some reason sets INSTALL = ../install) - # TODO: Investigate why - mv gmime/Makefile gmime/Makefile~ - sed 's/^\(INSTALL = \).*/\1install/' gmime/Makefile~ > gmime/Makefile printf " MAKE\t%s %s\n" "DESTDIR=$(realpath $DESTDIR)" install - make DESTDIR=$(realpath $DESTDIR) install + make DESTDIR=$(realpath $DESTDIR) INSTALL=install install install-legal:QV: $PKGBASE for legalfile in $LEGALFILES; do diff --git a/xapian-core/mkfile b/xapian-core/mkfile @@ -29,11 +29,8 @@ $PKGBASE:QV: make install:QV: $PKGBASE install-legal - # Fix Makefile (for some reason sets INSTALL = ../install) - # TODO: Investigate why - mv docs/Makefile docs/Makefile~ - sed 's/^\(INSTALL = \).*/\1install/' docs/Makefile~ > docs/Makefile - make DESTDIR=$(realpath $DESTDIR) install + printf " MAKE\t%s %s\n" DESTDIR=$(realpath $DESTDIR) install + make DESTDIR=$(realpath $DESTDIR) INSTALL=install install # Repeat forcing of libstdc++.a instead of libstdc++.so to also fix # packages depending on xapian-core mv $DESTDIR/lib/libxapian.la libxapian.la~