[Mageia-sysadm] [428] fix install of rpmb_deprecated, rpmrc and rpmpopt

[root at mageia.org]

Revision: 428
Author:   tmb
Date:     2011-02-05 23:10:22 +0100 (Sat, 05 Feb 2011)
Log Message:
-----------
fix install of rpmb_deprecated, rpmrc and rpmpopt

Modified Paths:
--------------
    rpm/rpm-setup/trunk/Makefile.am

Modified: rpm/rpm-setup/trunk/Makefile.am
===================================================================
--- rpm/rpm-setup/trunk/Makefile.am	2011-02-05 20:22:22 UTC (rev 427)
+++ rpm/rpm-setup/trunk/Makefile.am	2011-02-05 22:10:22 UTC (rev 428)
@@ -2,10 +2,12 @@
 
 arch_macrosfiles = $(RPMALLARCH:=.macros)
 
-pkg_data = 
+pkg_data = \
+		   rpmpopt
 
 pkg_gdata = \
-		   macros
+		   macros \
+		   rpmrc
 
 pkg_sysconf_macros_tmp = \
 		   build.macros
@@ -47,8 +49,6 @@
 		   php.req \
 		   pkgconfigdeps.sh \
 		   pythoneggs.py \
-		   rpmb_deprecated \
-		   rpmpopt \
 		   rubygems.rb
 
 pkg_gscripts = \
@@ -88,6 +88,7 @@
 	macros-perarch.in make_arch_macrosfiles.sh.in \
 	rpmgenplatform.in rpmrc.in \
 	rpm-spec-mode.el \
+	rpmb_deprecated \
 	tests.sh tests/macros.sh \
 	tests/findlang.pl tests/findlang.sh
 
@@ -125,6 +126,7 @@
 	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
@@ -158,5 +160,5 @@
 	sh tests.sh
 
 CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)\
-			 rpmrc macros-perarch $(pkg_sysconf_macros_tmp) \
+			 macros-perarch $(pkg_sysconf_macros_tmp) \
 			 make_arch_macrosfiles.sh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110205/56532382/attachment.html>