[treewide] delete unused patches

This commit is contained in:
c0bw3b
2019-05-04 19:52:24 +02:00
parent 01c27d6faf
commit 9cb260d091
60 changed files with 0 additions and 2233 deletions
@@ -1,25 +0,0 @@
From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 21 Sep 2014 12:19:30 -0700
Subject: [PATCH] Makefile-env: Don't force /sbin
---
src/Makefile-env.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index f2ab655..bf8876e 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS =
ceph_sbindir = $(sbindir)
# certain things go straight into /sbin, though!
-su_sbindir = /sbin
+su_sbindir = $(sbindir)
# C/C++ tests to build will be appended to this
check_PROGRAMS =
--
2.1.0
@@ -1,31 +0,0 @@
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index e176596..384e230 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -40,7 +40,7 @@ check_SCRIPTS =
export VERBOSE = true
# python unit tests need to know where the scripts are located
-export PYTHONPATH=$(top_srcdir)/src/pybind
+export PYTHONPATH+=:$(top_srcdir)/src/pybind
# when doing a debug build, make sure to make the targets
if WITH_DEBUG
diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
index 3e5ad03..66d6683 100644
--- a/src/ceph-detect-init/Makefile.am
+++ b/src/ceph-detect-init/Makefile.am
@@ -64,9 +64,10 @@ install-data-local::
if test "$(DESTDIR)" ; then \
if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
options=--install-layout=deb ; \
- else \
- options=--prefix=/usr ; \
fi ; \
root="--root=$(DESTDIR)" ; \
fi ; \
- python setup.py install $$root $$options
+ if test "$(prefix)"; then \
+ prefix="--prefix=$(prefix)" ; \
+ fi ; \
+ python setup.py install $$prefix $$root $$options