From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Nicholson Date: Fri, 26 Oct 2007 19:00:38 +0000 Subject: [PATCH 2/2] libvolume_id: Don't create /usr hierarchy when ${prefix} Message-Id: <1193425238-4278-3-git-send-email-dbn.lists@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hotplug@vger.kernel.org When libvolume_id is being installed to a non-/ location such as /usr/local, we don't want to setup the /usr/{include,lib} hierarchy. GNU make conditionals are used to separate the case where prefix is unset or is / and retains the current udev behavior. When prefix is something else, libvolume_id will be installed in a flat fashion. Signed-off-by: Dan Nicholson --- extras/volume_id/lib/Makefile | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile index b553111..f0cfba4 100644 --- a/extras/volume_id/lib/Makefile +++ b/extras/volume_id/lib/Makefile @@ -4,9 +4,19 @@ # # Released under the GNU General Public License, version 2. # -includedir = ${prefix}/usr/include +ifndef prefix +includedir = /usr/include +libdir = /lib +usrlibdir = /usr/lib +else ifeq (${prefix},/) +includedir = /usr/include +libdir = /lib +usrlibdir = /usr/lib +else +includedir = ${prefix}/include libdir = ${prefix}/lib -usrlibdir = ${prefix}/usr/lib +usrlibdir = ${prefix}/lib +endif INSTALL = install -c INSTALL_DATA = ${INSTALL} -m 644 -- 1.5.3.2 ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net Linux-hotplug-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel