From 93ba0c64e011dca6fe6df90508bc10efc75159ec Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 19 Dec 2007 18:12:54 +0000 Subject: 1.65: - add option --with-rpmplatform to install or not /etc/rpm/platform and genplatform - rpm-spec-mode.el: use buildroot macro instead of RPM_BUILD_ROOT environment variable --- Makefile.am | 2 ++ configure.ac | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4ff89e6..b4352c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,10 +101,12 @@ install-data-local: $(macrosfiles) $(pkg_gconfig) $(install_sh_DATA) $${i}.macros $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS)/macros; \ done [ -d $(DESTDIR)$(RPMSYSCONFDIR) ] || $(mkinstalldirs) $(DESTDIR)$(RPMSYSCONFDIR) +if RPMPLATFORM for i in $(pkg_gconfig); do \ $(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/$${i}; \ done $(install_sh_SCRIPT) rpmgenplatform $(DESTDIR)$(bindir)/rpmgenplatform +endif .PHONY: ChangeLog test diff --git a/configure.ac b/configure.ac index 8605103..f28b9c7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id$ AC_PREREQ(2.59) -AC_INIT(rpm-mandriva-setup, 1.64, nanardon@mandriva.org) +AC_INIT(rpm-mandriva-setup, 1.65, nanardon@mandriva.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9) AC_CONFIG_SRCDIR @@ -116,4 +116,8 @@ if test $with_rpmsysconfdir; then fi AC_SUBST(RPMSYSCONFDIR) + +AC_ARG_WITH(rpmplatform, [ --with-rpmplatform use /etc/rpm/platform ]) +AM_CONDITIONAL([RPMPLATFORM],[test $with_rpmplatform]) + AC_OUTPUT -- cgit v1.2.1