Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(5)

Unified Diff: Makefile.pre.in

Issue 25696: "make install" fails because bininstall target requires the libainstall target
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
--- a/Makefile.pre.in Thu Nov 26 23:52:34 2015 +0200
+++ b/Makefile.pre.in Sat Nov 28 02:24:27 2015 +0000
@@ -1109,7 +1109,7 @@
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
fi
-bininstall: altbininstall
+bininstall: altbininstall $(DESTDIR)$(LIBPC)
-if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/python3$(EXE); \
then rm -f $(DESTDIR)$(BINDIR)/python3$(EXE); \
else true; \
@@ -1364,8 +1364,12 @@
# pkgconfig directory
LIBPC= $(LIBDIR)/pkgconfig
-libainstall: all python-config
- @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \
+$(DESTDIR)$(LIBPC):
+ @echo "Creating directory $(LIBPC)"
+ @$(INSTALL) -d -m $(DIRMODE) $@
+
+libainstall: all python-config $(DESTDIR)$(LIBPC)
+ @for i in $(LIBDIR) $(LIBPL); \
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
« no previous file with comments | « no previous file | no next file » | no next file with comments »

RSS Feeds Recent Issues | This issue
This is Rietveld 894c83f36cb7+