docs-common Makefile.common,1.42,1.43

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	Makefile.common 
Log Message:
This seems to make packaging work again... probably needs checking for kludginess


Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.common	3 Feb 2006 22:20:13 -0000	1.42
+++ Makefile.common	4 Feb 2006 04:18:26 -0000	1.43
@@ -75,7 +75,7 @@
 #########################################################################
 # Use our very own "docs-common/bin/fdpsh" as the command interpreter
 # This automatically has ${FDPBIN} as first in the ${PATH}
-SHELL	=${FDPBIN}/fdpsh
+SHELL	=RPMINFO=${RPMINFO} ${FDPBIN}/fdpsh
 #########################################################################
 VERSION:=$(shell version doc)
 RELEASE:=$(shell version rpm)
@@ -250,7 +250,7 @@
 #
 $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
 #
-fdp-info::  $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
+fdp-info::  $(foreach LANG,${LANGUAGES},$(LANG)/fdp-info-$(LANG).xml)
 #
 #########################################################################
 # Make a new changelog entry for an existing rpm-info.xml file.
@@ -359,7 +359,7 @@
 
 package-prep::
 	${MAKE} distclean
-	${MAKE} ${DOCBASE}-${VERSION}.src.tar.gz
+	${MAKE} ${DOCBASE}-${shell version doc}.src.tar.gz
 	${MAKE} ${SPECFILE}
 	${MAKE} omf
 	${MAKE} kde.desktop
@@ -367,7 +367,7 @@
 	${RM} -r rpm
 	mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 	mkdir -p rpm/RPMS/{i386,i486,i586,i686,noarch,ppc,x86_64}
-	cp -f $(DOCBASE)-$(VERSION).src.tar.gz rpm/SOURCES/
+	cp -f $(DOCBASE)-$(shell version doc).src.tar.gz rpm/SOURCES/
 	cp -f ${SPECFILE} rpm/SPECS
 	cp -f *.omf *.desktop rpm/SOURCES