[SCM] zita-mu1/master: Fix install.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Fri Sep 4 06:42:20 UTC 2015


The following commit has been merged in the master branch:
commit 4986286e19ad1d48a8f87492ec95696afc9faf93
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Sep 4 08:29:06 2015 +0200

    Fix install.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index d31a868..a6f57a6 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,38 +1,38 @@
 Description: Put DESTDIR before PREFIX to set the installation path properly.
  Set prefix properly and removed -march=native cpp flag
+ Fix install
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
+Forwarded: Fons Adriaensen <fons at linuxaudio.org>
 
 Index: zita-mu1/source/Makefile
 ===================================================================
---- zita-mu1.orig/source/Makefile	2013-04-03 06:24:29.293521175 +0200
-+++ zita-mu1/source/Makefile	2013-04-03 07:02:19.993613504 +0200
-@@ -21,12 +21,12 @@
- 
- PROGRAM = zita-mu1
- VERSION = 0.2.0
--PREFIX = /usr/local
-+PREFIX = /usr
+--- zita-mu1.orig/source/Makefile
++++ zita-mu1/source/Makefile
+@@ -22,13 +22,13 @@ PROGRAM = zita-mu1
+ VERSION = 0.2.2
+ 
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ BINDIR ?= $(PREFIX)/bin
+ LIBDIR ?= lib$(SUFFIX)
+ 
  SHARED = $(PREFIX)/share/$(PROGRAM)
- CPPFLAGS += -O3 -Wall -MMD -MP -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
--CPPFLAGS += -march=native
-+#CPPFLAGS += -march=native
+ CPPFLAGS += -Wall -MMD -MP -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
+-CXXFLAGS += -O2 -march=native
++#CXXFLAGS += -O2 -march=native
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR)
  
  
- all:	zita-mu1
-@@ -46,9 +46,10 @@
+@@ -49,8 +49,9 @@ $(ZITA-MU1_O):
  
  
  install:	all
--	install -m 755 zita-mu1 $(PREFIX)/bin
--	install -d $(SHARED)
--	install -m 644 ../share/*.png $(SHARED)
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 755 zita-mu1 $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(SHARED)
+-	install -Dm 755 zita-mu1 $(DESTDIR)$(BINDIR)
+-	install -Dm 644 ../share/*.png $(DESTDIR)$(SHARED)
++	install -Dm 755 zita-mu1 $(DESTDIR)$(BINDIR)/zita-mu1
++	install -d  $(DESTDIR)$(SHARED)
 +	install -m 644 ../share/*.png $(DESTDIR)$(SHARED)
  
  
- clean:
+ uninstall:

-- 
zita-mu1 packaging



More information about the pkg-multimedia-commits mailing list