diff options
| author | Paul W. Frields <stickster@gmail.com> | 2006-02-04 04:18:26 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2006-02-04 04:18:26 +0000 |
| commit | 989cc1e41865d333118aecaf8edd75298e1d511a (patch) | |
| tree | 1d68e98a5554410a53ac953d025eaa1348ce3638 /Makefile.common | |
| parent | 4ca852ed8544c5fc20abc99c7f04d6fe77f50e5f (diff) | |
| download | fedora-doc-utils-989cc1e41865d333118aecaf8edd75298e1d511a.tar.gz fedora-doc-utils-989cc1e41865d333118aecaf8edd75298e1d511a.tar.xz fedora-doc-utils-989cc1e41865d333118aecaf8edd75298e1d511a.zip | |
This seems to make packaging work again... probably needs checking for kludginess
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 9d10c5d..1eb1902 100644 --- a/Makefile.common +++ b/Makefile.common @@ -75,7 +75,7 @@ XML2PO =xml2po ######################################################################### # 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 @@ endef # $(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 @@ $(DOCBASE)-$(VERSION).src.tar.gz:: 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 @@ package-prep:: ${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 |