forked from pool/libHX
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
|
From: Jan Engelhardt <jengelh@medozas.de>
|
||
|
|
|
||
|
|
Put libHX into a versioned directory to detect omission of
|
||
|
|
"pkg-config libHX --cflags" in dependent projects.
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 3 +++
|
||
|
|
include/Makefile.am | 2 +-
|
||
|
|
libHX.pc.in | 3 ++-
|
||
|
|
3 files changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: libHX-3.10.1/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- libHX-3.10.1.orig/configure.ac
|
||
|
|
+++ libHX-3.10.1/configure.ac
|
||
|
|
@@ -88,6 +88,9 @@ AC_CHECK_FUNCS([fork execv execvp pipe],
|
||
|
|
AC_CHECK_FUNCS([clock_gettime getegid geteuid getpid getppid])
|
||
|
|
AM_CONDITIONAL([B_PROC], [test "$b_proc" = 1])
|
||
|
|
|
||
|
|
+pkgincludedir='${includedir}'/"$PACKAGE_NAME-$PACKAGE_VERSION";
|
||
|
|
+AC_SUBST([pkgincludedir])
|
||
|
|
+
|
||
|
|
regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT"
|
||
|
|
regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
|
||
|
|
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
|
||
|
|
Index: libHX-3.10.1/include/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- libHX-3.10.1.orig/include/Makefile.am
|
||
|
|
+++ libHX-3.10.1/include/Makefile.am
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
# -*- Makefile -*-
|
||
|
|
|
||
|
|
-nobase_include_HEADERS = libHX.h \
|
||
|
|
+nobase_pkginclude_HEADERS = libHX.h \
|
||
|
|
libHX/ctype_helper.h libHX/defs.h libHX/deque.h libHX/init.h \
|
||
|
|
libHX/io.h libHX/list.h \
|
||
|
|
libHX/map.h libHX/misc.h libHX/option.h libHX/proc.h libHX/string.h \
|
||
|
|
Index: libHX-3.10.1/libHX.pc.in
|
||
|
|
===================================================================
|
||
|
|
--- libHX-3.10.1.orig/libHX.pc.in
|
||
|
|
+++ libHX-3.10.1/libHX.pc.in
|
||
|
|
@@ -3,10 +3,11 @@ prefix=@prefix@
|
||
|
|
exec_prefix=@exec_prefix@
|
||
|
|
libdir=@libdir@
|
||
|
|
includedir=@includedir@
|
||
|
|
+pkgincludedir=@pkgincludedir@
|
||
|
|
|
||
|
|
Name: libHX
|
||
|
|
Description: Useful collection of routines for C and C++ programming
|
||
|
|
Version: @PACKAGE_VERSION@
|
||
|
|
-Cflags: -I${includedir}
|
||
|
|
+Cflags: -I${pkgincludedir}
|
||
|
|
Libs: -L${libdir} -lHX
|
||
|
|
Libs.private: -ldl -lpthread -lrt
|