* stepmake/stepmake/help2man-rules.make:

* cygwin/mknetrel: Bugfix for manpages.

diff --git a/ChangeLog b/ChangeLog
index c8539ac8a4e50da2d9321a81a32d4a95b3ef5d85..726c66b866070361f5af1dc2248d8503800b8906 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * stepmake/stepmake/help2man-rules.make: 
+       * cygwin/mknetrel: Bugfix for manpages.
+
        * GNUmakefile.in (SUBDIRS): Use plain srcdir stepmake instead of
        $(builddir).  Stepmake is a normal subdirectory now, that is not
        configured.  Another srcdir build fix.
@@ -22,8 +25,6 @@
        * stepmake/stepmake/help2man-rules.make: Allow manpages to fail
        when cross building.
 
-       * stepmake/stepmake/help2man-rules.make: 
-
        * configure.in: srcdir build fix.
 
        * cygwin/GNUmakefile:

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 4fb5bf81e45dfa3261f75cc9debb4d8f7a5114aa..358c7ef13fabdd9dc67c68ea86824eb9ded77c40 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -104,13 +104,18 @@ prebuild () {
        mkdir -p $inst-$i || exit 1
     done
     
-    # Build for build, generating doc
+    # Build for build-host, generating doc
     cd $build || exit 1
-    
-    #PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1
-    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc web || exit 1
-    for i in $(find . -path "out-for-build/*.1"); do
-       cp -pv $i $(dirname $(dirname $i))/$(basename $i)
+
+    PATH=/bin:/usr/bin:$PATH \
+       PYTHONPATH=$build/python/out-for-build:$PYTHONPATH \
+       make conf=for-build all doc web || exit 1
+
+    # as of 1.9.9, this should no longer be necessary:
+    for i in $(find . -path ".*out-for-build/*.1"); do
+       o=$(dirname $(dirname $i))/out
+       mkdir -p $o
+       cp -pv $i $o/$(basename $i)
     done
 
     mkdir -p mf/out

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index 1c939fc90c7479f16749b9a21f272efae31f2971..734238d88266a336a7ae1985fb2462c33275036c 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -1,8 +1,3 @@
-ifneq ($(outdir),./out)
-$(outdir)/%.1: out/%.1
-       cp $< $@
-endif
-
 # We must invoke the generated $(outdir)/help2man script instead of
 # the help2man.pl source, which means that the buildscripts directory
 # must be built first.
@@ -22,16 +17,19 @@ endif
 
 HELP2MAN_COMMAND = $(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@
 
-ifeq ($(cross),)
+ifeq ($(CROSS),)
 $(outdir)/%.1: $(outdir)/%
        $(HELP2MAN_COMMAND)
 else
-# When cross building, some manpages will not build because the executable
-# does not run.  We don not want to disable building manpages, because
-# the cross build process may generate them using a native executable.
-$(outdir)/%.1: $(outdir)/%
-       $(HELP2MAN_COMMAND) || \
-       (echo ""; echo "Apparently the man pages failed to build. This is";\
-        echo "no problem, since they don't contain any information anyway.";\
-        echo "Please run make again, and be prepared for NO manual pages.")
+# When cross building, some manpages will not build because the
+# executable does not run.  We assume the manpages to be generated
+# during a previous compile for the build host, with config=for-build,
+# in the directory $(outdir)-for-build.
+$(outdir)/%.1: $(outdir:%=%-for-build)/%.1
+       cp $< $@
+endif
+
+ifneq ($(outdir),./out)
+$(outdir)/%.1: out/%.1
+       cp $< $@
 endif