diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-29 14:45:33 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-29 14:45:33 +0000 |
| commit | d5081c357120ff01b2f2d2d0fdbf181af289a1c8 (patch) | |
| tree | ef02617a9ee6f39fa3851e7091e3cfbdd690b4c6 | |
| parent | 022f0a2e34a7c6bb19a0485af5a169df33d59097 (diff) | |
| download | rpm-setup-d5081c357120ff01b2f2d2d0fdbf181af289a1c8.tar rpm-setup-d5081c357120ff01b2f2d2d0fdbf181af289a1c8.tar.gz rpm-setup-d5081c357120ff01b2f2d2d0fdbf181af289a1c8.tar.bz2 rpm-setup-d5081c357120ff01b2f2d2d0fdbf181af289a1c8.tar.xz rpm-setup-d5081c357120ff01b2f2d2d0fdbf181af289a1c8.zip | |
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)
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 7 insertions, 0 deletions
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 |