From: W. Trevor King <wking@drexel.edu>
Date: Sat, 11 Dec 2010 16:06:59 +0000 (-0500)
Subject: Patch comedilib demo/Makefile so it successfully compiles after installation.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3adb7764559b3b2168199f131316caf01868b7ad;p=wtk-overlay.git

Patch comedilib demo/Makefile so it successfully compiles after installation.
---

diff --git a/Manifest b/Manifest
index d665e40..21d8889 100644
--- a/Manifest
+++ b/Manifest
@@ -1,6 +1,6 @@
 AUX comedilib-9999-demo-Makefile.patch 2441 RMD160 ce1a0bbe8ef30c15719b07ea6c339a3150ef7e47 SHA1 f1ba6ed50b76f22bcc9818a90e82d0b91d7317bc SHA256 5cc777180310853252ede607a6074652f973ed79c9c9308a3f0b453dd7ac4d93
 AUX comedilib-9999-setup.py.patch 962 RMD160 efcd89f8528e18a68ba8ff3756f00c047fdb228e SHA1 60827fa147aba30d5b5749260e1a1d928047222a SHA256 219864acf1610e2ddd94eb14eca8983fd336511db7626dde5a6347e11822a983
 AUX comedilib-9999-setup.rb.patch 318 RMD160 c9bcd07119fb7c2c92ce9c133947f51a3bd85c51 SHA1 8e213fdc3c319b611e23a98fe0844db55ef28aed SHA256 afb1fa061a2b703a66e09c408b21a337592d519ead51984f78f7b64dbc74c5a9
-EBUILD comedilib-9999.ebuild 3748 RMD160 9f1d123d394dc5f8bedd91fea6fa0ba45d5f0994 SHA1 0784158a7957707383759c7c0ed13075637e31ff SHA256 3e0c7688271bb29b0557478f503b363bab30e6dee9ed6cc174839b2d3a7ca79b
+EBUILD comedilib-9999.ebuild 3796 RMD160 329df58e88d9f5378854095288cb32249fc658e1 SHA1 f36a9594a923e3989951ca94d7d4d1ad601c7e6b SHA256 c8beafc406a0f1c54e9b81ec5b03eac430495e2bdad01d2a21df34307c1559f5
 MISC ChangeLog 1168 RMD160 62c9992630de85e02a25d5a4cc077386211b8859 SHA1 bc9d91fff9c4f05804d564f5e55fd63ed99c3426 SHA256 6766a0d3f76055ed559975a91df6f2876289f129248fa739853da0d2606bec9f
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72
diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild
index da3e270..2f5ce8f 100644
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -107,6 +107,7 @@ src_install()
 	local DOCINTO="/usr/share/doc/${PF}"
 	local DDOCINTO="${D}${DOCINTO}"
 	if use doc ; then
+		epatch "${FILESDIR}/${P}-demo-Makefile.patch"
 		pushd "${DDOCINTO}" || die "failed to pushd"
 		mv *.conf etc/ || die 'moving *.conf failed'
 		popd || die "failed to popd"
diff --git a/files/comedilib-9999-demo-Makefile.patch b/files/comedilib-9999-demo-Makefile.patch
new file mode 100644
index 0000000..8d57503
--- /dev/null
+++ b/files/comedilib-9999-demo-Makefile.patch
@@ -0,0 +1,72 @@
+--- a/demo/Makefile	2010-12-11 09:58:59.000000000 -0500
++++ b/demo/Makefile	2010-12-11 10:29:17.000000000 -0500
+@@ -267,7 +267,7 @@
+ tut2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(tut2_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)
++DEFAULT_INCLUDES = -I.
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+@@ -319,9 +319,9 @@
+ CCDEPMODE = depmode=gcc3
+ CFLAGS = -O2 -march=pentium4 -pipe
+ COMEDILIB_AGE = 10
+-COMEDILIB_CFLAGS =  -I$(top_srcdir)/include -Wall
++COMEDILIB_CFLAGS = -Wall
+ COMEDILIB_CURRENT = 10
+-COMEDILIB_LIBS =  $(top_builddir)/lib/libcomedi.la -lm
++COMEDILIB_LIBS =  -lcomedi -lm
+ COMEDILIB_LIBVERSION = 10:0:10
+ COMEDILIB_LT_LDFLAGS =  -version-info 10:0:10
+ COMEDILIB_REVISION = 0
+@@ -351,7 +351,7 @@
+ LEX_OUTPUT_ROOT = lex.yy
+ LIBOBJS = 
+ LIBS = 
+-LIBTOOL = $(SHELL) $(top_builddir)/libtool
++LIBTOOL = libtool
+ LIPO = 
+ LN_S = ln -s
+ LTLIBOBJS = 
+@@ -555,34 +555,18 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+ $(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+-	        && { if test -f $@; then exit 0; else break; fi; }; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demo/Makefile'; \
+-	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu demo/Makefile
++	@echo "automake $@"
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
++	@echo "automake $@"
+ 
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	@echo "automake $@"
+ 
+ $(top_srcdir)/configure: # $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	@echo "automake $@"
+ $(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	@echo "automake $@"
+ $(am__aclocal_m4_deps):
+ 
+ clean-noinstPROGRAMS: