[gimp-help-2: 4/4] Merge branch 'buildsystem/cygwin-windows-quirks'

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit 59bb2cf4bfad96f5e659d4b67df6426fbec98d29
Merge: b7d67b8... af8b702...
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Mon Nov 30 20:10:45 2009 +0100

    Merge branch 'buildsystem/cygwin-windows-quirks'
    
    * cygwin-windows-quirks:
      Adapt build system to Cygwin
      More changes to image links script
      Enhance Perl script for making links to images
    
    Conflicts:
    
    	Makefile.am

 Makefile.am               |   33 ++++++++-
 configure.ac              |   11 +++
 tools/make_image_links.pl |  186 +++++++++++++++++++++++++++++++++++----------
 3 files changed, 188 insertions(+), 42 deletions(-)
---
diff --cc Makefile.am
index 4b606c5,93c2487..57d3f0c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -576,15 -574,25 +597,24 @@@ html/%/index.html: xml/% $(HTML_STYLESH
  	  stylesheets/plainhtml.xsl \
  	  xml/$*/gimp.xml
  
 -	$(cmd) for file in $(srcdir)/stylesheets/*.css; do \
 -		if [ -f $$file ]; then cp -f $$file html/$*; fi; \
 -	done
 -
 -	$(cmd) for file in $(srcdir)/stylesheets/$*/*.css; do \
 -		if [ -f $$file ]; then cp -f $$file html/$*; fi; \
 +	$(msg) "Copying stylesheets ... "
 +	$(cmd) for file in $(srcdir)/stylesheets/*.css \
 +	                   $(srcdir)/stylesheets/$*/*.css; do \
 +		if [ -f $${file} ]; then cp -f $${file} html/$*; fi; \
  	done
  
 +####  HTML images  ####
  # TODO: check/enhance new image files structure
- html-images-%: html/%/images ;
+ if CYGWIN
+ # Cygwin
+ html/%/images: FORCE
+ 	$(cmd) test -h $@ && rm -f $@
+ 	$(cmd) test -d $@ && rm -rf $@/* || $(MKDIR_P) $@
+ 	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
+ 	           --mode=hardlink,copy \
+ 	           $(srcdir)/images/{common,C} $@
+ else
+ # Default (non-Cygwin)
  html/%/images: xml/%/images
  	$(cmd) test -d html/$* || $(MKDIR_P) html/$*
  	$(cmd) test -e $@ || $(LN_S) ../../$< $@