diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-12-19 18:12:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-12-19 18:12:54 +0000 |
| commit | 93ba0c64e011dca6fe6df90508bc10efc75159ec (patch) | |
| tree | 6d2fd853fb9a68f4df2320ce49895e58036dfdf1 | |
| parent | 607e6ccbc58d54b73e5737010ba196d7e7e0c5cc (diff) | |
| download | rpm-setup-93ba0c64e011dca6fe6df90508bc10efc75159ec.tar rpm-setup-93ba0c64e011dca6fe6df90508bc10efc75159ec.tar.gz rpm-setup-93ba0c64e011dca6fe6df90508bc10efc75159ec.tar.bz2 rpm-setup-93ba0c64e011dca6fe6df90508bc10efc75159ec.tar.xz rpm-setup-93ba0c64e011dca6fe6df90508bc10efc75159ec.zip | |
1.65: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
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 1 deletions
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 |