[med-svn] [libzstd] 13/14: Fix makefile install prefix

Kevin Murray daube-guest at moszumanska.debian.org
Thu Dec 17 06:13:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

daube-guest pushed a commit to branch master
in repository libzstd.

commit 867a7b0385eae30945b74b31f3b24112612c131c
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Tue Dec 8 11:51:26 2015 +1100

    Fix makefile install prefix
---
 .../0003-Use-prefix-of-usr-not-usr-local.patch     | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch b/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
new file mode 100644
index 0000000..6b70dec
--- /dev/null
+++ b/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
@@ -0,0 +1,35 @@
+From: Kevin Murray <spam at kdmurray.id.au>
+Date: Tue, 8 Dec 2015 11:50:58 +1100
+Subject: Use prefix of /usr not /usr/local
+
+---
+ lib/Makefile      | 2 +-
+ programs/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 3e34d89..fc05f1a 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -39,7 +39,7 @@ LIBVER  = $(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
+ VERSION?= $(LIBVER)
+ 
+ DESTDIR?=
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ CPPFLAGS= -I. -I./legacy -DZSTD_LEGACY_SUPPORT=1
+ CFLAGS ?= -O3
+ CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
+diff --git a/programs/Makefile b/programs/Makefile
+index 0921590..1eadb98 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -33,7 +33,7 @@
+ VERSION?= 0.4.0
+ 
+ DESTDIR?=
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ CPPFLAGS= -I../lib -DZSTD_VERSION=\"$(VERSION)\"
+ CFLAGS ?= -O3  # -falign-loops=32   # not always beneficial
+ CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
diff --git a/debian/patches/series b/debian/patches/series
index a82b89d..ceb23a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Skip-long-running-tests.patch
 0002-Build-lib-by-default.patch
+0003-Use-prefix-of-usr-not-usr-local.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git



More information about the debian-med-commit mailing list