OK, it took about 10 weeks to answer, but I finally managed to get something done. Version 2 of the patch hopefully addresses the points you mentioned: - No more manext stuff - Added a missing @ in front of sed - Package the generated flashrom.8
To install: Apply patch, then "svn mv flashrom.8 flashrom.man.in". Caveats: - Is "date +%F" supported on all packaging platforms? - For some reason flashrom.man.in does not get packaged on my system, thus causing a build failure of the tarball. Does including files require an "svn commit"? - Due to the problem above, I could not verify that the build process will not normally attempt to build flashrom.8 (which should be newer than flashrom.man.in). Thanks Jörg -- Joerg Mayer <[email protected]> We are stuck with technology when what we really want is just stuff that works. Some say that should read Microsoft instead of technology.
Index: Makefile =================================================================== --- Makefile (revision 1653) +++ Makefile (working copy) @@ -318,6 +318,7 @@ RELEASE := 0.9.6.1 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION) +DATE := $(shell LC_ALL=C date +%F) SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' @@ -608,7 +609,7 @@ LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS) -all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) +all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 ifeq ($(ARCH), x86) @+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX) endif @@ -632,7 +633,7 @@ # This includes all frontends and libflashrom. # We don't use EXEC_SUFFIX here because we want to clean everything. clean: - rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d + rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d $(PROGRAM).8 @+$(MAKE) -C util/ich_descriptors_tool/ clean distclean: clean @@ -826,6 +827,9 @@ @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features @rm -f .featuretest.c .featuretest$(EXEC_SUFFIX) +$(PROGRAM).8: $(PROGRAM).man.in + @sed -e "s#@VERSION@#$(VERSION)#g" -e "s#@DATE@#$(DATE)#g" <$< >$@ + install: $(PROGRAM)$(EXEC_SUFFIX) mkdir -p $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(MANDIR)/man8 @@ -836,6 +840,7 @@ @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME) @svn export -r BASE . $(EXPORTDIR)/flashrom-$(RELEASENAME) @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile + @sed -e "s#@VERSION@#$(VERSION)#g" -e "s#@DATE@#$(DATE)#g" flashrom.man.in >$(EXPORTDIR)/flashrom-$(RELEASENAME)/flashrom.8 @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(RELEASENAME)/ChangeLog @echo Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/ Index: flashrom.8 =================================================================== --- flashrom.8 (revision 1653) +++ flashrom.8 (working copy) @@ -1,4 +1,4 @@ -.TH FLASHROM 8 "Dec, 2012" +.TH FLASHROM 8 "@DATE@" "@VERSION@" "Handle flash chips" .SH NAME flashrom \- detect, read, write, verify and erase flash chips .SH SYNOPSIS
_______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
