Bug 175307 - Makefile.common ${DOCBASE}-$(1)/index.html incorrect handling of figs/
Summary: Makefile.common ${DOCBASE}-$(1)/index.html incorrect handling of figs/
Keywords:
Status: CLOSED CURRENTRELEASE
Alias: None
Product: Fedora Documentation
Classification: Fedora
Component: docs-requests
Version: devel
Hardware: All
OS: Linux
medium
medium
Target Milestone: ---
Assignee: Karsten Wade
QA Contact: Tommy Reynolds
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2005-12-08 18:48 UTC by James Laska
Modified: 2013-09-02 06:07 UTC (History)
4 users (show)

Fixed In Version: CVS
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2005-12-11 03:26:16 UTC
Embargoed:


Attachments (Terms of Use)

Description James Laska 2005-12-08 18:48:57 UTC
===================================================================
File: Makefile.common   Status: Up-to-date

   Working revision:    1.17
   Repository revision: 1.17    /cvs/docs/docs-common/Makefile.common,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)


The current html_nochunk path does not properly copy over all images in figs/. 
The Makefile.common logic assumes all figs are in the figs/* directory.  For
several large documents we build, it is helpfull to seperate figs into
subdirectories by chapter (figs/ch-intro, figs/apx-1, etc...).  

The following patch resolves the issue, however it pulls in all figs which
appears to not be intended (don't want *.eps)?

Index: ../docs-common/Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile.common
--- ../docs-common/Makefile.common      2 Dec 2005 16:03:46 -0000       1.17
+++ ../docs-common/Makefile.common      8 Dec 2005 18:51:23 -0000
@@ -87,11 +87,7 @@
        cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
        cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/
        [ ! -d figs ] || (                                              \
-               mkdir -p ${DOCBASE}-$(1)/figs;                          \
-               find figs -type f -iname '*.*' -print           |       \
-               egrep -vi '*.eps'                               |       \
-               egrep '(.*-$(1)..*)|([^-]*[.][^-]*)'            |       \
-               while read x; do cp -f $$$${x} ${DOCBASE}-$(1)/figs; done \
+               cp -a figs ${DOCBASE}-$(1)/figs;                                \
        ) && exit 0
 endef
 #

Comment 1 Tommy Reynolds 2005-12-11 03:26:16 UTC
This code snippet is actually from the HTML "chunks" stanza; no figs/ copying is
done for the "nochunks" variant.

Added "docs-common/bin/copy-figs" shell script to copy the "figs"/ structure and
content.

Comment 2 eric 2009-07-07 04:09:27 UTC
Ticket moved to allow products to be removed from BZ.


Note You need to log in before you can comment on or make changes to this bug.