mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 21:30:08 +02:00
51 lines
1.6 KiB
Plaintext
51 lines
1.6 KiB
Plaintext
From 40b2c1f916c450195884c7db57bbea9155e297fc Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 8 Jun 2014 18:39:53 +0200
|
|
Subject: Fix include directories for Haiku.
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 5acdc36..14b8325 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -33,19 +33,19 @@ include $(NSBUILD)/Makefile.top
|
|
|
|
# Extra installation rules
|
|
Is := include/parserutils
|
|
-I := /include/parserutils
|
|
+I := /$(INCLUDEDIR)/parserutils
|
|
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
|
|
|
|
Is := include/parserutils/charset
|
|
-I := /include/parserutils/charset
|
|
+I := /$(INCLUDEDIR)/parserutils/charset
|
|
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
|
|
|
|
Is := include/parserutils/input
|
|
-I := /include/parserutils/input
|
|
+I := /$(INCLUDEDIR)/parserutils/input
|
|
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
|
|
|
|
Is := include/parserutils/utils
|
|
-I := /include/parserutils/utils
|
|
+I := /$(INCLUDEDIR)/parserutils/utils
|
|
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
|
|
|
|
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
|
|
diff --git a/libparserutils.pc.in b/libparserutils.pc.in
|
|
index 307e909..1a46cf8 100644
|
|
--- a/libparserutils.pc.in
|
|
+++ b/libparserutils.pc.in
|
|
@@ -1,7 +1,7 @@
|
|
prefix=PREFIX
|
|
exec_prefix=${prefix}
|
|
libdir=${exec_prefix}/LIBDIR
|
|
-includedir=${prefix}/include
|
|
+includedir=${prefix}/INCLUDEDIR
|
|
|
|
Name: libparserutils
|
|
Description: Utility library for facilitating parser development
|
|
--
|
|
1.8.3.4
|
|
|