docs-common Makefile,1.9,1.10

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31494

Modified Files:
	Makefile 
Log Message:
Patch Makefile, thanks Ignacio


Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	4 Feb 2006 16:45:42 -0000	1.9
+++ Makefile	14 Feb 2006 22:50:42 -0000	1.10
@@ -21,7 +21,8 @@
 # Some RPM flags...
 ######################################################
 RPMFLAGS 	= 	--define "docbase $(DOCBASE)" \
-			--define "_topdir $(PWD)/rpmbuild"
+			--define "_topdir $(PWD)/rpmbuild" \
+			--define "_build_name_fmt %{name}-%{version}-%{release}.%{arch}.rpm"
 
 RPM		= rpm ${RPMFLAGS}
 ######################################################
@@ -72,7 +73,7 @@
 # Do the build...
 #
 	rpmbuild -ba $(RPMFLAGS) $(DOCSPEC)
-	mv $(shell ${RPM} --eval '%{_rpmdir}')/noarch/*.rpm .
+	mv $(shell ${RPM} --eval '%{_rpmdir}')/*.rpm .
 	mv $(shell ${RPM} --eval '%{_srcrpmdir}')/*.rpm .
 	rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
 	rm -rf $(shell ${RPM} --eval '%{_topdir}')