mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 16:38:01 +00:00
b254a02218Massages Makefile.in into fail-early form, fixes generated parser by adding missing function declarations. Closes: https://bugs.gentoo.org/932280 Closes: https://bugs.gentoo.org/930372 Closes: https://bugs.gentoo.org/883893 Signed-off-by: NHOrus <jy6x2b32pie9@yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/40586 Signed-off-by: Sam James <sam@gentoo.org>
72 lines
1.5 KiB
Diff
72 lines
1.5 KiB
Diff
Fix for the build system.
|
|
Allows propagating errors upwards, replaces sometimes dubious
|
|
if well-meaning seds from ebuild
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -44,19 +44,19 @@
|
|
#
|
|
|
|
gnushogi_compile:
|
|
- -cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME)
|
|
+ $(MAKE) -C $(GNUSHOGIDIR) $(PROGNAME)
|
|
|
|
pat2inc:
|
|
- -cd $(GNUSHOGIDIR) && $(MAKE) pat2inc
|
|
+ $(MAKE) -C $(GNUSHOGIDIR) pat2inc
|
|
|
|
sizetest:
|
|
- -cd $(GNUSHOGIDIR) && $(MAKE) sizetest
|
|
+ $(MAKE) -C $(GNUSHOGIDIR) sizetest
|
|
|
|
xshogi_compile:
|
|
- -cd $(XSHOGIDIR) && $(MAKE)
|
|
+ $(MAKE) -C $(XSHOGIDIR)
|
|
|
|
-bbk:
|
|
+bbk: gnushogi_compile pat2inc sizetest
|
|
- -cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME).bbk
|
|
+ $(MAKE) -C $(GNUSHOGIDIR) $(PROGNAME).bbk
|
|
|
|
|
|
#
|
|
@@ -73,10 +73,10 @@
|
|
install: gnushogi_install @XSHOGIINSTALL@
|
|
|
|
gnushogi_install:
|
|
- -cd $(GNUSHOGIDIR) && $(MAKE) install
|
|
+ $(MAKE) -C $(GNUSHOGIDIR) install
|
|
|
|
xshogi_install: $(XSHOGIDIR)/xshogi
|
|
- -cd $(XSHOGIDIR) && $(MAKE) install
|
|
+ $(MAKE) -C $(XSHOGIDIR) install
|
|
|
|
|
|
|
|
@@ -87,13 +87,13 @@
|
|
clean: gnushogi_clean @XSHOGICLEAN@ doc_clean
|
|
|
|
gnushogi_clean:
|
|
- cd $(GNUSHOGIDIR) && $(MAKE) clean
|
|
+ $(MAKE) -C $(GNUSHOGIDIR) clean
|
|
|
|
xshogi_clean:
|
|
- cd $(XSHOGIDIR) && $(MAKE) clean
|
|
+ $(MAKE) -C $(XSHOGIDIR) clean
|
|
|
|
doc_clean:
|
|
- cd $(BUILDROOT)/doc && $(MAKE) clean
|
|
+ $(MAKE) -C $(BUILDROOT)/doc clean
|
|
|
|
|
|
#
|
|
--- a/gnushogi/Makefile.in
|
|
+++ b//gnushogi/Makefile.in
|
|
@@ -51,7 +51,7 @@
|
|
|
|
# Where the language description, the book, and the
|
|
# persistent hashtable live.
|
|
-LIBDIR = $(prefix)/lib/$(PROGNAME)
|
|
+LIBDIR = @libdir@
|
|
|
|
# Where the man page goes.
|
|
MANDIR = $(prefix)/man/man6
|