components/curl/patches/004-Makefile.in.patch
branchs11u2-sru
changeset 4799 f6da2b76c51b
parent 174 187aa0541610
--- a/components/curl/patches/004-Makefile.in.patch	Thu Aug 13 01:28:22 2015 -0700
+++ b/components/curl/patches/004-Makefile.in.patch	Thu Aug 20 01:17:21 2015 -0700
@@ -1,22 +1,20 @@
---- include/curl/Makefile.in	2010-10-01 13:49:18.000000000 -0700
-+++ include/curl/Makefile.in	2011-03-31 11:29:48.945604347 -0700
-@@ -306,18 +306,8 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Adjust how the stamp-h2: Makefile target works.
+
+I'm not sure why this is here. It comes from the previous curl maintainer.
+It needs to be further investigated and either removed or reworked into
+something that can be passed upstream.
+
+--- include/curl/Makefile.in.orig	2014-09-10 12:19:40.843896341 -0700
++++ include/curl/Makefile.in	2014-09-10 12:20:56.618505665 -0700
+@@ -441,9 +441,9 @@
+ 	@test -f $@ || rm -f stamp-h2
+ 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
  
--curlbuild.h: stamp-h3
--	@if test ! -f $@; then \
--	  rm -f stamp-h3; \
--	  $(MAKE) stamp-h3; \
--	else :; fi
--
--stamp-h3: $(srcdir)/curlbuild.h.in $(top_builddir)/config.status
-+stamp-h3:
- 	@rm -f stamp-h3
+-stamp-h2: $(srcdir)/curlbuild.h.in $(top_builddir)/config.status
++stamp-h2:
+ 	@rm -f stamp-h2
 -	cd $(top_builddir) && $(SHELL) ./config.status include/curl/curlbuild.h
--$(srcdir)/curlbuild.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	rm -f stamp-h3
- 	touch $@
++	touch $@
  
  distclean-hdr:
+ 	-rm -f curlbuild.h stamp-h2