[SCM] japa/master: updated 01-makefile.patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4fd4ec79a3643105ef633ea809978df12ce42c46
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Feb 21 02:50:01 2011 +0100

    updated 01-makefile.patch

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index f59689e..4bf9497 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,17 +1,24 @@
-Description:  Fix install commands.
+Description:  Fix prefix, set g++ optimalization to -O3, removed -march=native optimalization.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: No
 Index: japa/Makefile
 ===================================================================
---- japa.orig/Makefile	2011-02-15 01:18:52.000000000 +0100
-+++ japa/Makefile	2011-02-15 01:24:27.630054228 +0100
-@@ -33,7 +33,8 @@
+--- japa.orig/Makefile	2011-02-21 02:30:47.000000000 +0100
++++ japa/Makefile	2011-02-21 02:40:04.323273216 +0100
+@@ -19,13 +19,13 @@
+ #  --------------------------------------------------------------------------
  
  
- install:	japa
--	/usr/bin/install -m 755 japa $(PREFIX)/bin
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 japa $(DESTDIR)/$(PREFIX)/bin
- 
- $(JAPA_O):	$(JAPA_H)
+-PREFIX = /usr/local
++PREFIX = /usr
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+ LIBDIR = lib$(SUFFIX)
+ VERSION = 0.6.0
+ DISTDIR = japa-$(VERSION)
+-CPPFLAGS += -O2 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+-CPPFLAGS += -march=native
++CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
++#CPPFLAGS += -march=native
  
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
+ LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt

-- 
japa packaging