[patch] Cross-compile patch

cross-compile.patch (text/plain), 1.14 KB, created by Jacob Godserv on 2009-02-07 03:46:06 UTC

--- src/Makefile.am	2009-02-06 20:19:48.000000000 -0500
+++ src/Makefile.am	2009-02-06 21:57:33.000000000 -0500
@@ -430,11 +437,15 @@
 	  { echo 'the above variables should have static scope' 1>&2;	\
 	    exit 1; } || :
 
-.PHONY: cu-install-binPROGRAMS
+# Use the just-built ./ginstall, when not cross-compiling.
+# Override automake's install-one-at-a-time rule, when possible.
 install-exec-am:
-	@case '$(program_transform_name):$(EXEEXT)' in		\
+	@(./ginstall --version) > /dev/null 2>&1		\
+	  && install=./ginstall					\
+	  || install='$(INSTALL_PROGRAM)';			\
+	case '$(program_transform_name):$(EXEEXT)' in		\
 	  's,x,x,:') cu=cu-;; *) cu= ;; esac;			\
-	$(MAKE) $(AM_MAKEFLAGS) binPROGRAMS_INSTALL=./ginstall	\
+	$(MAKE) $(AM_MAKEFLAGS) binPROGRAMS_INSTALL="$$install"	\
 	  $${cu}install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
@@ -451,6 +462,7 @@
 filtered_PROGS = \
   `echo "$(bin_PROGRAMS)" | sed 's/ *\<ginstall\> */ /;s/ *\[ */ /'`
 d_bindir = $(DESTDIR)$(bindir)
+.PHONY: cu-install-binPROGRAMS
 cu-install-binPROGRAMS: $(bin_PROGRAMS)
 	$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(d_bindir)"