mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 02:42:18 +00:00
7dcd5fded7Straight-up autoreconf fails, autoupdate produces non-viable configure. Also make build system respect our DESTDID, which also replaces sed with a patch Closes: https://bugs.gentoo.org/874531 Closes: https://bugs.gentoo.org/899938 Closes: https://bugs.gentoo.org/836081 Signed-off-by: NHOrus <jy6x2b32pie9@yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/40453 Signed-off-by: Sam James <sam@gentoo.org>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
Make build system respect DESTDIR, fix just the configure
|
|
as a path of least resistance.
|
|
Autoreconf stuffs spaces where they don't belong and produces
|
|
broken configure
|
|
https://bugs.gentoo.org/899938
|
|
https://bugs.gentoo.org/874531
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -652,7 +652,7 @@
|
|
#line 653 "configure"
|
|
#include "confdefs.h"
|
|
|
|
-main(){return(0);}
|
|
+int main(){return(0);}
|
|
EOF
|
|
if { (eval echo configure:658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
ac_cv_prog_cc_works=yes
|
|
@@ -1092,6 +1092,7 @@
|
|
#line 1119 "configure"
|
|
#include "confdefs.h"
|
|
#include <ctype.h>
|
|
+#include <stdlib.h>
|
|
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -63,7 +63,7 @@
|
|
tar -czvf isic-$(VERSION).tgz ./isic-$(VERSION)/* )
|
|
|
|
install: $(BINS) $(MAN)
|
|
- $(INSTALL) -m 0755 -d $(PREFIX)/bin
|
|
- $(INSTALL) -m 0755 -c $(BINS) $(PREFIX)/bin
|
|
- $(INSTALL) -m 0755 -d $(PREFIX)/man/man1
|
|
- ${INSTALL} -m 0755 -c $(MAN) $(PREFIX)/man/man1
|
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(PREFIX)/bin
|
|
+ $(INSTALL) -m 0755 -c $(BINS) $(DESTDIR)/$(PREFIX)/bin
|
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(PREFIX)/share/man/man1
|
|
+ ${INSTALL} -m 0755 -c $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man1
|