Skip to content

Commit 204acba

Browse files
committed
Align header install path
For this release we will still dump our header to `<prefix>/include`. Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
1 parent 8c40dcd commit 204acba

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ install(TARGETS ${PROJECT_NAME}
164164
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
165165
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
166166
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
167-
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
167+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
168168
)
169169

170170
# Install libtommath.pc for pkg-config if we build a shared library

libtommath.pc.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
prefix=@to-be-replaced@
2-
exec_prefix=${prefix}
3-
libdir=${exec_prefix}/lib
4-
includedir=${prefix}/include
1+
prefix=@CMAKE_INSTALL_PREFIX@
2+
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
3+
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
54

65
Name: LibTomMath
76
Description: public domain library for manipulating large integer numbers
8-
Version: @to-be-replaced@
7+
Version: @PROJECT_VERSION@
98
Libs: -L${libdir} -ltommath
109
Cflags: -I${includedir}

makefile.shared

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ install: $(LIBNAME)
7070
install -d $(DESTDIR)$(INCPATH)
7171
$(LIBTOOL) --mode=install install -m 644 $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
7272
install -m 644 $(HEADERS_PUB) $(DESTDIR)$(INCPATH)
73-
sed -e 's,^prefix=.*,prefix=$(PREFIX),' -e 's,^Version:.*,Version: $(VERSION_PC),' libtommath.pc.in > libtommath.pc
73+
sed -e 's,^prefix=.*,prefix=$(PREFIX),' -e 's,^Version:.*,Version: $(VERSION_PC),' -e 's,@CMAKE_INSTALL_LIBDIR@,lib,' \
74+
-e 's,@CMAKE_INSTALL_INCLUDEDIR@,include,' libtommath.pc.in > libtommath.pc
7475
install -d $(DESTDIR)$(LIBPATH)/pkgconfig
7576
install -m 644 libtommath.pc $(DESTDIR)$(LIBPATH)/pkgconfig/
7677

0 commit comments

Comments
 (0)