This is the mail archive of the
insight@sourceware.org
mailing list for the Insight project.
Re: Parallel install insight 6.6 fails
On 3/24/07, Jie Zhang <jzhang918@gmail.com> wrote:
This patch only change 2 lines. So I think it's trivial. This patch
makes install-libraries target depend on installdirs target for itcl
and itk, which will ensure that $(ITCL_LIBRARY) directory is created
before install-libraries tries to install libraries in it.
We later found iwidgets has the same issue. Here is an updated patch.
Jie
2007-03-26 Jie Zhang <jie.zhang@analog.com>
* iwidgets/Makefile.in (installdirs): New target.
(install-libraries): Depends on installdirs.
(install-demos): Likewise.
(install-doc): Likewise.
* itk/Makefile.in (install-libraries): Likewise.
* itcl/Makefile.in (install-libraries): Likewise.
Index: itcl/iwidgets/Makefile.in
===================================================================
--- itcl/iwidgets/Makefile.in (revision 1530)
+++ itcl/iwidgets/Makefile.in (working copy)
@@ -126,8 +126,8 @@
$(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
-exedir `@CYGPATH@ $(TK_SRC_DIR)/unix` $(TESTFLAGS)
-install-libraries:
- @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
+install-libraries: installdirs
+ @$(MKINSTALLDIRS) $(LIB_INSTALL_DIR)
@rm -f $(LIB_INSTALL_DIR)/iwidgets
# REDHAT LOCAL
# $(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets
@@ -144,7 +144,7 @@
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
done;
-install-demos:
+install-demos: installdirs
@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
@echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
@for i in $(srcdir)/demos/*; \
@@ -168,7 +168,7 @@
fi; \
done;
-install-doc:
+install-doc: installdirs
@$(MKINSTALLDIRS) $(MAN_INSTALL_DIR)
@echo "Installing man pages from $(TOP_DIR)/doc into $(MAN_INSTALL_DIR)"
@cd $(TOP_DIR)/doc; for i in *.n; \
@@ -181,6 +181,9 @@
done;
$(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
+installdirs:
+ $(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)
+
Makefile: $(srcdir)/Makefile.in
$(SHELL) config.status
@@ -196,4 +199,7 @@
configure: configure.in
autoconf
+.PHONY: info all install test install-libraries install-demos install-doc \
+installdirs clean depend distclean
+
# DO NOT DELETE THIS LINE -- make depend depends on it.
Index: itcl/itk/Makefile.in
===================================================================
--- itcl/itk/Makefile.in (revision 1530)
+++ itcl/itk/Makefile.in (working copy)
@@ -266,7 +266,7 @@
# This rule installs platform-independent files, such as header files.
#========================================================================
-install-libraries: libraries
+install-libraries: libraries installdirs
$(mkinstalldirs) $(includedir)
@echo "Installing header files in $(includedir)"
@for i in $(GENERIC_HDRS) ; do \
Index: itcl/itcl/Makefile.in
===================================================================
--- itcl/itcl/Makefile.in (revision 1530)
+++ itcl/itcl/Makefile.in (working copy)
@@ -271,7 +271,7 @@
# This rule installs platform-independent files, such as header files.
#========================================================================
-install-libraries: libraries
+install-libraries: libraries installdirs
$(mkinstalldirs) $(includedir)
@echo "Installing header files in $(includedir)"
@for i in $(GENERIC_HDRS) ; do \