* Makefile.in: Create install targets.
(cygwin-ug-net/cygwin-ug-net.pdf): Create subdir to allow building PDF even if subdir is missing. (cygwin-api/cygwin-api.pdf): Ditto. * configure.ac: Add AC_PROG_INSTALL rule. * configure: Regenerate. * new-features.xml (ov-new1.7.33): Add installation of docs.
This commit is contained in:
Corinna Vinschen
parent
419092e490
commit
fdf455637b
|
|
@ -1,3 +1,13 @@
|
|||
2014-10-22 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* Makefile.in: Create install targets.
|
||||
(cygwin-ug-net/cygwin-ug-net.pdf): Create subdir to allow building PDF
|
||||
even if subdir is missing.
|
||||
(cygwin-api/cygwin-api.pdf): Ditto.
|
||||
* configure.ac: Add AC_PROG_INSTALL rule.
|
||||
* configure: Regenerate.
|
||||
* new-features.xml (ov-new1.7.33): Add installation of docs.
|
||||
|
||||
2014-10-22 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* posix.xml (std-gnu): Add ffsl, ffsll, quotactl.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# -*- Makefile -*- for winsup/doc
|
||||
# Copyright (c) 1998-2000, 2001, 2002, 2004, 2005, 2006, 2008, 2009, 2010,
|
||||
# 2013 Red Hat, Inc.
|
||||
# 2013, 2014 Red Hat, Inc.
|
||||
#
|
||||
# This file is part of Cygwin.
|
||||
#
|
||||
|
|
@ -12,6 +12,15 @@ SHELL = @SHELL@
|
|||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
datarootdir:=@datarootdir@
|
||||
docdir = @docdir@
|
||||
htmldir = @htmldir@
|
||||
|
||||
override INSTALL:=@INSTALL@
|
||||
override INSTALL_DATA:=@INSTALL_DATA@
|
||||
|
||||
MKDIRP:=$(INSTALL) -m 755 -d
|
||||
|
||||
CC:=@CC@
|
||||
CC_FOR_TARGET:=@CC@
|
||||
|
||||
|
|
@ -27,6 +36,8 @@ FAQ_SOURCES:= $(wildcard $(srcdir)/faq*.xml)
|
|||
.html.body:
|
||||
$(srcdir)/bodysnatcher.pl $<
|
||||
|
||||
.PHONY: all clean install install-all install-pdf install-html tarball
|
||||
|
||||
all: Makefile Makefile.dep \
|
||||
cygwin-ug-net/cygwin-ug-net.html \
|
||||
cygwin-ug-net/cygwin-ug-net-nochunks.html.gz \
|
||||
|
|
@ -43,7 +54,21 @@ clean:
|
|||
rm -f *.html *.html.gz
|
||||
rm -Rf cygwin-api cygwin-ug cygwin-ug-net faq
|
||||
|
||||
install: all
|
||||
install: install-all
|
||||
|
||||
install-all: install-pdf install-html
|
||||
|
||||
install-pdf: cygwin-ug-net/cygwin-ug-net.pdf cygwin-api/cygwin-api.pdf
|
||||
@$(MKDIRP) $(DESTDIR)$(docdir)
|
||||
$(INSTALL_DATA) $^ $(DESTDIR)$(docdir)
|
||||
|
||||
install-html: cygwin-ug-net/cygwin-ug-net.html cygwin-api/cygwin-api.html
|
||||
@$(MKDIRP) $(DESTDIR)$(htmldir)/cygwin-ug-net
|
||||
$(INSTALL_DATA) cygwin-ug-net/*.html $(DESTDIR)$(htmldir)/cygwin-ug-net
|
||||
$(INSTALL_DATA) cygwin-ug-net/cygwin-ug-net.html $(DESTDIR)$(htmldir)/cygwin-ug-net/index.html
|
||||
@$(MKDIRP) $(DESTDIR)$(htmldir)/cygwin-api
|
||||
$(INSTALL_DATA) cygwin-api/*.html $(DESTDIR)$(htmldir)/cygwin-api
|
||||
$(INSTALL_DATA) cygwin-api/cygwin-api.html $(DESTDIR)$(htmldir)/cygwin-api/index.html
|
||||
|
||||
cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : cygwin-ug-net.xml
|
||||
-$(XMLTO) html-nochunks -m $(srcdir)/cygwin.xsl $<
|
||||
|
|
@ -55,12 +80,14 @@ cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.xml cygwin.xsl
|
|||
-$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $<
|
||||
|
||||
cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml fo.xsl
|
||||
@$(MKDIRP) cygwin-ug-net
|
||||
-$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@
|
||||
|
||||
cygwin-api/cygwin-api.html : cygwin-api.xml cygwin.xsl
|
||||
-$(XMLTO) html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
|
||||
|
||||
cygwin-api/cygwin-api.pdf : cygwin-api.xml fo.xsl
|
||||
@$(MKDIRP) cygwin-api
|
||||
-$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@
|
||||
|
||||
faq/faq.html : $(FAQ_SOURCES)
|
||||
|
|
|
|||
|
|
@ -608,6 +608,9 @@ build_os
|
|||
build_vendor
|
||||
build_cpu
|
||||
build
|
||||
INSTALL_DATA
|
||||
INSTALL_SCRIPT
|
||||
INSTALL_PROGRAM
|
||||
target_alias
|
||||
host_alias
|
||||
build_alias
|
||||
|
|
@ -1778,6 +1781,99 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|||
|
||||
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
# SysV /etc/install, /usr/sbin/install
|
||||
# SunOS /usr/etc/install
|
||||
# IRIX /sbin/install
|
||||
# AIX /bin/install
|
||||
# AmigaOS /C/install, which installs bootblocks on floppy discs
|
||||
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
|
||||
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# OS/2's system install, which has a completely different semantic
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
# Reject install programs that cannot install multiple files.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
||||
$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
||||
if test -z "$INSTALL"; then
|
||||
if ${ac_cv_path_install+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
# Account for people who put trailing slashes in PATH elements.
|
||||
case $as_dir/ in #((
|
||||
./ | .// | /[cC]/* | \
|
||||
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
||||
?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
|
||||
/usr/ucb/* ) ;;
|
||||
*)
|
||||
# OSF1 and SCO ODT 3.0 have their own names for install.
|
||||
# Don't use installbsd from OSF since it installs stuff as root
|
||||
# by default.
|
||||
for ac_prog in ginstall scoinst install; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
||||
if test $ac_prog = install &&
|
||||
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||||
# AIX install. It has an incompatible calling convention.
|
||||
:
|
||||
elif test $ac_prog = install &&
|
||||
grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||||
# program-specific install script used by HP pwplus--don't use.
|
||||
:
|
||||
else
|
||||
rm -rf conftest.one conftest.two conftest.dir
|
||||
echo one > conftest.one
|
||||
echo two > conftest.two
|
||||
mkdir conftest.dir
|
||||
if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
||||
test -s conftest.one && test -s conftest.two &&
|
||||
test -s conftest.dir/conftest.one &&
|
||||
test -s conftest.dir/conftest.two
|
||||
then
|
||||
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||||
break 3
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
rm -rf conftest.one conftest.two conftest.dir
|
||||
|
||||
fi
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
INSTALL=$ac_cv_path_install
|
||||
else
|
||||
# As a last resort, use the slow shell script. Don't cache a
|
||||
# value for INSTALL within a source directory, because that will
|
||||
# break other packages using the cache if that directory is
|
||||
# removed, or if the value is a relative name.
|
||||
INSTALL=$ac_install_sh
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
|
||||
$as_echo "$INSTALL" >&6; }
|
||||
|
||||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||||
# It thinks the first close brace ends the variable substitution.
|
||||
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
||||
|
||||
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
|
||||
# Make sure we can run config.sub.
|
||||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||||
|
|
@ -3462,6 +3558,7 @@ gives unlimited permission to copy, distribute and modify it."
|
|||
|
||||
ac_pwd='$ac_pwd'
|
||||
srcdir='$srcdir'
|
||||
INSTALL='$INSTALL'
|
||||
test -n "\$AWK" || AWK=awk
|
||||
_ACEOF
|
||||
|
||||
|
|
@ -3897,6 +3994,10 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
|||
# CONFIG_FILE
|
||||
#
|
||||
|
||||
case $INSTALL in
|
||||
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
||||
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
|
||||
esac
|
||||
_ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
|
|
@ -3950,6 +4051,7 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
|||
s&@builddir@&$ac_builddir&;t t
|
||||
s&@abs_builddir@&$ac_abs_builddir&;t t
|
||||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||||
s&@INSTALL@&$ac_INSTALL&;t t
|
||||
$ac_datarootdir_hack
|
||||
"
|
||||
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ AC_INIT([Cygwin Documentation], 0,
|
|||
AC_CONFIG_SRCDIR(cygwin-api.xml)
|
||||
AC_CONFIG_AUX_DIR(../..)
|
||||
|
||||
AC_PROG_INSTALL
|
||||
AC_NO_EXECUTABLES
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
|
|
|
|||
|
|
@ -51,6 +51,11 @@ New APIs: ffsl, ffsll (glibc extensions).
|
|||
New API: stime (SVr4).
|
||||
</para></listitem>
|
||||
|
||||
<listitem><para>
|
||||
Provide Cygwin documentation (PDFs and HTML) for offline usage in
|
||||
<filename>/usr/share/doc/cygwin-${version}</filename>.
|
||||
</para></listitem>
|
||||
|
||||
<listitem><para>
|
||||
New internal exception handling based on SEH on 64 bit Cygwin.
|
||||
</para></listitem>
|
||||
|
|
|
|||
Loading…
Reference in New Issue