Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1c73f195
Commit
1c73f195
authored
May 09, 2008
by
Glenn Morris
Browse files
(install-arch-indep, info): Handle MAKEINFO == off.
parent
09817afc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
ChangeLog
ChangeLog
+6
-0
Makefile.in
Makefile.in
+7
-4
No files found.
ChangeLog
View file @
1c73f195
2008-05-09 Glenn Morris <rgm@gnu.org>
* configure.in: Make absence of makeinfo a fatal error only if the info
files don't exist.
* Makefile.in (install-arch-indep, info): Handle MAKEINFO == off.
2008-05-07 Eli Zaretskii <eliz@gnu.org>
2008-05-07 Eli Zaretskii <eliz@gnu.org>
* config.bat: Fix last change: don't use < and > in "rem" lines,
* config.bat: Fix last change: don't use < and > in "rem" lines,
...
...
Makefile.in
View file @
1c73f195
...
@@ -554,7 +554,7 @@ install-arch-indep: mkdir info install-etc
...
@@ -554,7 +554,7 @@ install-arch-indep: mkdir info install-etc
fi
;
\
fi
;
\
cd
${srcdir}
/info
;
\
cd
${srcdir}
/info
;
\
for
elt
in
$(INFO_FILES)
;
do
\
for
elt
in
$(INFO_FILES)
;
do
\
test
"
$(MAKEINFO)
"
=
"
n
o"
&&
!
test
-e
$$
elt
&&
continue
;
\
test
"
$(MAKEINFO)
"
=
"o
ff
"
&&
!
test
-e
$$
elt
&&
continue
;
\
for
f
in
`
ls
$$
elt
$$
elt-[1-9]
$$
elt-[1-9][0-9] 2>/dev/null
`
;
do
\
for
f
in
`
ls
$$
elt
$$
elt-[1-9]
$$
elt-[1-9][0-9] 2>/dev/null
`
;
do
\
${INSTALL_DATA}
$$
f
$(DESTDIR)${infodir}
/
$$
f
;
\
${INSTALL_DATA}
$$
f
$(DESTDIR)${infodir}
/
$$
f
;
\
chmod
a+r
$(DESTDIR)${infodir}
/
$$
f
;
\
chmod
a+r
$(DESTDIR)${infodir}
/
$$
f
;
\
...
@@ -566,7 +566,7 @@ install-arch-indep: mkdir info install-etc
...
@@ -566,7 +566,7 @@ install-arch-indep: mkdir info install-etc
if
[
`
(
cd
${srcdir}
/info
&&
/bin/pwd
)
`
!=
`
(
cd
$(DESTDIR)${infodir}
&&
/bin/pwd
)
`
]
;
\
if
[
`
(
cd
${srcdir}
/info
&&
/bin/pwd
)
`
!=
`
(
cd
$(DESTDIR)${infodir}
&&
/bin/pwd
)
`
]
;
\
then
\
then
\
for
elt
in
$(INFO_FILES)
;
do
\
for
elt
in
$(INFO_FILES)
;
do
\
test
"
$(MAKEINFO)
"
=
"
n
o"
&&
!
test
-e
$$
elt
&&
continue
;
\
test
"
$(MAKEINFO)
"
=
"o
ff
"
&&
!
test
-e
$$
elt
&&
continue
;
\
(
cd
$
${thisdir}
;
\
(
cd
$
${thisdir}
;
\
${INSTALL_INFO}
--info-dir
=
$(DESTDIR)${infodir}
$(DESTDIR)${infodir}
/
$$
elt
)
;
\
${INSTALL_INFO}
--info-dir
=
$(DESTDIR)${infodir}
$(DESTDIR)${infodir}
/
$$
elt
)
;
\
done
;
\
done
;
\
...
@@ -785,8 +785,11 @@ force-info:
...
@@ -785,8 +785,11 @@ force-info:
# put the info files in $(srcdir),
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
# so we can do ok running make in the build dir.
info
:
force-info
info
:
force-info
@
if
test
"
$(MAKEINFO)
"
=
"no"
;
then
\
@
if
test
"
$(MAKEINFO)
"
=
"off"
;
then
\
echo
"Configured without makeinfo, not building manuals"
;
\
echo
"Configured --without-makeinfo, not building manuals"
;
\
elif
test
"
$(MAKEINFO)
"
=
"no"
;
then
\
echo
"makeinfo is missing - cannot build manuals"
;
\
exit
1
;
\
else
\
else
\
$(MAKE)
$(MFLAGS)
info-real
;
\
$(MAKE)
$(MFLAGS)
info-real
;
\
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment