[SCM] jmeters/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 27981d689b82762d490ce190543754d74dc68f37
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Mar 30 09:29:40 2012 +0200

    Refresh

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 871c5d2..c77d739 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -3,10 +3,12 @@ Description: Put DESTDIR before PREFIX to set the installation path properly.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
-Index: jmeters-0.2.0/source/Makefile
-===================================================================
---- jmeters-0.2.0.orig/source/Makefile	2011-08-03 04:21:07.000000000 +0200
-+++ jmeters-0.2.0/source/Makefile	2011-08-03 04:23:42.064576034 +0200
+---
+ source/Makefile |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- jmeters.orig/source/Makefile
++++ jmeters/source/Makefile
 @@ -14,8 +14,8 @@
  #  along with this program; if not, write to the Free Software
  #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -14,22 +16,22 @@ Index: jmeters-0.2.0/source/Makefile
 -
 -PREFIX = /usr/local
 +DESTDIR=
-+PREFIX = /usr
++PREFIX ?= /usr/local
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
  SHARED = $(PREFIX)/share
-@@ -42,10 +42,10 @@
+@@ -43,10 +43,10 @@ $(JMETERS_O):
  
  
  install:	all
--	/usr/bin/install -d $(PREFIX)/bin
--	/usr/bin/install -m 755 jmeters $(PREFIX)/bin
--	/usr/bin/install -d $(SHARED)/jmeters
--	/usr/bin/install -m 644 ../share/* $(SHARED)/jmeters
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 jmeters $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -d $(DESTDIR)$(SHARED)/jmeters
-+	/usr/bin/install -m 644 ../share/* $(DESTDIR)$(SHARED)/jmeters
+-	install -d $(PREFIX)/bin
+-	install -m 755 jmeters $(PREFIX)/bin
+-	install -d $(SHARED)/jmeters
+-	install -m 644 ../share/* $(SHARED)/jmeters
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 755 jmeters $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(SHARED)/jmeters
++	install -m 644 ../share/* $(DESTDIR)$(SHARED)/jmeters
  
  clean:
  	/bin/rm -f *~ *.o *.a *.d *.so

-- 
jmeters packaging