From d5081c357120ff01b2f2d2d0fdbf181af289a1c8 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 29 Jan 2008 14:45:33 +0000 Subject: add option --with-only-rpmrc. when used, per-arch macros are not installed (%optflags is already in rpmrc and other macros and in standard rpm per-arch macros) --- Makefile.am | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Makefile.am b/Makefile.am index c694305..f5357f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,10 +97,14 @@ platform32: rpmgenplatform Makefile perl rpmgenplatform $(CANONTARGETCPU32) > $@ install-data-local: $(macrosfiles) $(pkg_gconfig) +if ONLY_RPMRC + echo "not installing per-arch macros which are already in rpmrc and standard rpm per-arch macros" +else for i in $(RPMALLARCH); do \ $(mkinstalldirs) $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS); \ $(install_sh_DATA) $${i}.macros $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS)/macros; \ done +endif [ -d $(DESTDIR)$(RPMSYSCONFDIR) ] || $(mkinstalldirs) $(DESTDIR)$(RPMSYSCONFDIR) $(install_sh_SCRIPT) rpmb_deprecated $(DESTDIR)$(RPMLIBDIR) if RPMPLATFORM diff --git a/configure.ac b/configure.ac index e5d6d71..5f39938 100644 --- a/configure.ac +++ b/configure.ac @@ -120,4 +120,7 @@ AC_SUBST(RPMSYSCONFDIR) AC_ARG_WITH(rpmplatform, [ --with-rpmplatform use /etc/rpm/platform ]) AM_CONDITIONAL([RPMPLATFORM],[test $with_rpmplatform]) +AC_ARG_WITH(only-rpmrc, [ --with-only-rpmrc rpm uses rpmrc ]) +AM_CONDITIONAL([ONLY_RPMRC],[test $with_only_rpmrc]) + AC_OUTPUT -- cgit v1.2.1