From 233b5a1921a6c2c438fb1516abdcc01cc5a244e8 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 27 Sep 2003 09:41:53 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 6 ++++++
cygwin/mknetrel | 24 ++++++++++++++++++++----
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 773c0d2723..c1040eec41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
2003-09-27 Jan Nieuwenhuizen <janneke@gnu.org>
+ * cygwin/mknetrel: Use EXTRABUILDARGS, EXTRAINSTALLARGS instead of
+ addmakeflags. Build and install doc and web also when building on
+ Cygwin.
+
+ * mf/GNUmakefile: Bugfix.
+
* GNUmakefile.in (web-install): Bugfix: set out prefix Similar to
target web.
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 03529b8b28..b054ec12e8 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -102,13 +102,27 @@ prebuild () {
mkdir -p mf/out
cp -pv mf/out-for-build/* mf/out
fi
-
- addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
+
+ EXTRABUILDARGS="LDFLAGS=$cygwin_root/usr/bin/libpython2.3.dll"
+
+ # set LDFLAGS to find the python library
+ # addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' "target=i686-pc-cygwin" ' '
+
+ if iscygwin; then
+ EXTRABUILDARGS="$EXTRABUILDARGS all doc web"
+ fi
}
preinstall () {
- addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
+ # set LDFLAGS to find the python library
+ # addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' "target=i686-pc-cygwin"
+# if ! iscygwin; then
+# EXTRAINSTALLARGS="target=i686-pc-cygwin"
+# else
+ if iscygwin; then
+ EXTRAINSTALLARGS="web-install target=i686-pc-cygwin"
+ fi
}
postinstall () {
@@ -117,7 +131,9 @@ postinstall () {
mkdir -p $inst-doc/$docprefix
cd $build || exit 1
- make conf=for-build webdir=$inst-doc/$packagedocdir web-install
+ if ! iscygwin; then
+ make conf=for-build webdir=$inst-doc/$packagedocdir web-install
+ fi
## copy READMEs etc
--
2.39.5