From f654553f49d433d54f098f0a15a9db66da4660b7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 14 Feb 2008 15:30:08 +0000 Subject: 1.73: rpmpopt, rpmb_deprecated and rpmrc are now in rpm-manbo-setup --- Makefile.am | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 364c5bb..8f43654 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,9 @@ arch_macrosfiles = $(RPMALLARCH:=.macros) -pkg_data = \ - rpmpopt +pkg_data = pkg_gdata = \ - rpmrc \ macros pkg_sysconf_macros_tmp = \ @@ -75,9 +73,8 @@ EXTRA_DIST = \ $(pkg_scripts) \ $(pkg_scripts_in) \ macros-perarch.in make_arch_macrosfiles.sh.in \ - rpmgenplatform.in \ + rpmgenplatform.in rpmrc.in \ rpm-spec-mode.el \ - rpmb_deprecated \ tests.sh tests/macros.sh \ tests/findlang.pl tests/findlang.sh @@ -94,7 +91,7 @@ edit = sed \ %: %.in Makefile $(edit) $< > $@ -$(arch_macrosfiles): macros-perarch make_arch_macrosfiles.sh +$(arch_macrosfiles): rpmrc macros-perarch make_arch_macrosfiles.sh arch=`echo $@ | sed 's,\\.macros,,'`; \ sh ./make_arch_macrosfiles.sh macros-perarch $$arch > $@ @@ -114,7 +111,6 @@ else done endif [ -d $(DESTDIR)$(RPMSYSCONFDIR)/macros.d ] || $(mkinstalldirs) $(DESTDIR)$(RPMSYSCONFDIR)/macros.d - $(install_sh_SCRIPT) rpmb_deprecated $(DESTDIR)$(RPMLIBDIR) for i in $(pkg_sysconf_macros); do \ $(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/macros.d/$${i}; \ done @@ -135,5 +131,5 @@ test: $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig) sh tests.sh CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)\ - macros-perarch $(pkg_sysconf_macros_tmp) \ + rpmrc macros-perarch $(pkg_sysconf_macros_tmp) \ make_arch_macrosfiles.sh -- cgit v1.2.1