[packages/rpm-build-macros] Set BINDIR, SBINDIR, LIBEXECDIR, SYSCONFDIR, SHAREDSTATEDIRPATH, LOCALSTATEDIRPATH, INCLUDEDIR, OLDI
arekm
arekm at pld-linux.org
Tue Dec 9 12:50:28 CET 2014
commit e23de4fc5f828bd016b946b4c9f0f46fbfc73bdf
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Dec 9 12:50:07 2014 +0100
Set BINDIR, SBINDIR, LIBEXECDIR, SYSCONFDIR, SHAREDSTATEDIRPATH,
LOCALSTATEDIRPATH, INCLUDEDIR, OLDINCLUDEDIR, DATAROOTDIR, DATADIR,
INFODIR, LOCALEDIR, MANDIR, DOCDIR in cmake macro, too.
rpm-build-macros.spec | 2 +-
rpm.macros | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 18c2a9f..71d22ca 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.697
+%define rpm_macros_rev 1.698
%define find_lang_rev 1.36
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index ab6b88e..b957110 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -264,7 +264,21 @@ CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
%{__cmake} \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \\\
+ -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \\\
+ -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \\\
+ -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\
+ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \\\
+ -DCMAKE_INSTALL_SHAREDSTATEDIRPATH:PATH=%{_sharedstatedir} \\\
+ -DCMAKE_INSTALL_LOCALSTATEDIRPATH:PATH=%{_localstatedir} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
+ -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\
+ -DCMAKE_INSTALL_OLDINCLUDEDIR:PATH=%{_includedir} \\\
+ -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{_datadir} \\\
+ -DCMAKE_INSTALL_DATADIR:PATH=%{_datadir} \\\
+ -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \\\
+ -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_localedir} \\\
+ -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \\\
+ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-DCMAKE_CXX_FLAGS_PLD="${CXXFLAGS:-%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG}" \\\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/e23de4fc5f828bd016b946b4c9f0f46fbfc73bdf
More information about the pld-cvs-commit
mailing list