Update comedilib/demo/Makefile patch.

diff --git a/ChangeLog b/ChangeLog
index 4c112116db2bc07d1804e2aef3c6d41d1a658b02..15d8e14155bf09da2307b3bbbfaab627164b1728 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*comedilib-9999 (13 May 2011)
+
+  13 May 2011; W. Trevor King <wking@drexel.edu> comedilib-9999-demo-Makefile.patch
+  - Update demo/Makefile patch.
+
 *comedilib-9999 (22 Mar 2011)
 
-  22 Mar 2012; W. Trevor King <wking@drexel.edu> comedilib-9999.ebuild :
+  22 Mar 2011; W. Trevor King <wking@drexel.edu> comedilib-9999.ebuild :
   - Follow upstream from CVS to Git.
   - Override RUBYOPT when configuring ruby installation.  With an
     unmasked RUBYOPT="-rauto_gem" (set by dev-ruby/rubygems via

diff --git a/Manifest b/Manifest
index 3e1c07a8e2c45982bab422b0c53d03e8c007f945..2df9c468d2538783652de8f9858edcea229bee17 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,4 +1,4 @@
-AUX comedilib-9999-demo-Makefile.patch 2505 RMD160 76278a724696a5fc3f4fb9e1b297018b6ce83953 SHA1 bc3401ed2c69ac87144621eba6bbe825b16e679f SHA256 25fd857769c8c5390289db546cd8e7686372edcdbdea0ffd989b45689a8ba6b1
+AUX comedilib-9999-demo-Makefile.patch 2512 RMD160 4f827f6ff33f3a74eda57b5298c39d725d5dcddc SHA1 e40a18d3a8084b297079f6de3bf84f7221083d2c SHA256 510fba930ae097c5bd9cf850381a7217e30a026180b68bea316fb2c2085a5a7d
 EBUILD comedilib-9999.ebuild 3726 RMD160 6c1f41801c6ebcc320b1b2098395f10c100d55bf SHA1 cf0590a1304c88f20eab364d54df6c5a97c4dd85 SHA256 09a9c2f0b79edc754fd3a1e1af41cb0038441838b4cb469f32d50cfbeb127bad
-MISC ChangeLog 2384 RMD160 6bf83257645b2e009e3ddf6805d71e9f47b18d6b SHA1 fdc254f99a9cec7f34a82adb5f154f0fd69485ce SHA256 9ae0413d8dfb88d64421a536e80ea8e893d22d77aac8e7bafa795944d8cd18bf
+MISC ChangeLog 2532 RMD160 e3734cd0da28944991dcfd1ba6cc7097a9484182 SHA1 08bf441dde6de596f8b34c447ef24d469a49a524 SHA256 6f47ed1843b0e1fa19ce3334bece52421a3e051ac397e048d4140c4a4dc0e979
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/files/comedilib-9999-demo-Makefile.patch b/files/comedilib-9999-demo-Makefile.patch
index 2e716d1ee2c1718fd136244f887d90d4388ce00d..e865fbc3653a99a07d859a6ce34742d2ae71253d 100644 (file)
--- a/files/comedilib-9999-demo-Makefile.patch
+++ b/files/comedilib-9999-demo-Makefile.patch
@@ -11,9 +11,9 @@
  am__mv = mv -f
 @@ -319,9 +319,9 @@
  CCDEPMODE = depmode=gcc3
- CFLAGS = -O2 -march=pentium4 -pipe
+ CFLAGS = -g -O2
  COMEDILIB_AGE = 10
--COMEDILIB_CFLAGS =  -I$(top_srcdir)/include -Wall
+-COMEDILIB_CFLAGS =  -I$(top_srcdir)/include -I$(top_builddir)/include -Wall
 +COMEDILIB_CFLAGS = -Wall $(shell pkg-config --cflags comedilib)
  COMEDILIB_CURRENT = 10
 -COMEDILIB_LIBS =  $(top_builddir)/lib/libcomedi.la -lm
@@ -21,7 +21,7 @@
  COMEDILIB_LIBVERSION = 10:0:10
  COMEDILIB_LT_LDFLAGS =  -version-info 10:0:10
  COMEDILIB_REVISION = 0
-@@ -351,7 +351,7 @@
+@@ -354,7 +354,7 @@
  LEX_OUTPUT_ROOT = lex.yy
  LIBOBJS = 
  LIBS = 
@@ -30,7 +30,7 @@
  LIPO = 
  LN_S = ln -s
  LTLIBOBJS = 
-@@ -555,34 +555,18 @@
+@@ -558,34 +558,18 @@
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
  $(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)