mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-20 02:30:05 +02:00
45 lines
1.4 KiB
Plaintext
45 lines
1.4 KiB
Plaintext
From 4a0ea106ab2a23af3798b7a3114c969f7339c05a Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 8 Jun 2014 18:12:27 +0200
|
|
Subject: Add support for INCLUDEDIR in pkg-config files.
|
|
|
|
|
|
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
|
|
index 5b76f23..2f21be0 100644
|
|
--- a/makefiles/Makefile.tools
|
|
+++ b/makefiles/Makefile.tools
|
|
@@ -21,6 +21,8 @@
|
|
# (defaults to /usr/local)
|
|
# LIBDIR Library installation directory in ${PREFIX}
|
|
# (defaults to lib)
|
|
+# INCLUDEDIR Header installation directory in ${PREFIX}
|
|
+# (defaults to include)
|
|
#
|
|
|
|
###############################################################################
|
|
@@ -373,6 +375,9 @@ PREFIX ?= /usr/local
|
|
# Default libdir
|
|
LIBDIR ?= lib
|
|
|
|
+# Default includedir
|
|
+INCLUDEDIR ?= include
|
|
+
|
|
###############################################################################
|
|
# Tool defaults
|
|
###############################################################################
|
|
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
|
|
index 6329c47..bd51ecd 100644
|
|
--- a/makefiles/Makefile.top
|
|
+++ b/makefiles/Makefile.top
|
|
@@ -291,6 +291,7 @@ define install_pkgconfig
|
|
-e 's#MAJOR#$(major-version)#' \
|
|
-e 's#MINOR#$(minor-version)#' \
|
|
-e 's#PATCH#$(patch-version)#' \
|
|
+ -e 's#INCLUDEDIR#$(INCLUDEDIR)#' \
|
|
-e 's#VERSION#$(COMPONENT_VERSION)#' \
|
|
-e 's#REQUIRED#$(__required)#' \
|
|
$1 >$(BUILDDIR)/$(1:.in=)
|
|
--
|
|
1.8.3.4
|
|
|