Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7864e4ee
Commit
7864e4ee
authored
Feb 21, 2008
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(set_installuser): New.
(install-arch-indep): Use set_installuser to avoid duplicate code.
parent
a8a4617a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
17 deletions
+13
-17
ChangeLog
ChangeLog
+3
-0
Makefile.in
Makefile.in
+10
-17
No files found.
ChangeLog
View file @
7864e4ee
2008-02-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (set_installuser): New.
(install-arch-indep): Use set_installuser to avoid duplicate code.
* README.unicode: Split into admin/notes/unicode,font-backend and
remove.
...
...
Makefile.in
View file @
7864e4ee
...
...
@@ -414,6 +414,13 @@ install-arch-dep: mkdir
&&
cat
>
/dev/null
)))
||
exit
1
;
\
fi
## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
## Needs to be the user running install, so configure can't set it.
set_installuser
=
for
installuser
in
$
${LOGNAME}
$
${USERNAME}
$
${USER}
\
`
id
-un
2> /dev/null
`
;
do
\
[
-n
"
$
${installuser}
"
]
&&
break
;
\
done
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
### the exception is the DOC-* files, which are copied
...
...
@@ -431,11 +438,6 @@ install-arch-dep: mkdir
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
## installuser:
## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
## Nuisance because i) it needs to be the user running install, so
## configure can't set it; ii) can't (?) use the result of rule
## commands to set make variables.
install-arch-indep
:
mkdir info install-etc
-
set
${COPYDESTS}
;
\
unset
CDPATH
;
\
...
...
@@ -449,10 +451,7 @@ install-arch-indep: mkdir info install-etc
mkdir
${COPYDESTS}
;
\
chmod
ugo+rx
${COPYDESTS}
;
\
unset
CDPATH
;
\
for
installuser
in
$
${LOGNAME}
$
${USERNAME}
$
${USER}
\
`
id
-un
2> /dev/null
`
;
do
\
[
-n
"
$
${installuser}
"
]
&&
break
;
\
done
;
\
$(set_installuser)
;
\
for
dir
in
${COPYDIR}
;
do
\
dest
=
$$
1
;
shift
;
\
[
-d
$
${dir}
]
\
...
...
@@ -510,10 +509,7 @@ install-arch-indep: mkdir info install-etc
(
cd
./etc
;
tar
-chf
-
$
${docfile}
)
\
|
(
cd
$(DESTDIR)${docdir}
;
umask
022
;
tar
-xvf
-
&&
cat
>
/dev/null
)
||
exit
1
;
\
(
cd
$(DESTDIR)$(docdir)
;
\
for
installuser
in
$
${LOGNAME}
$
${USERNAME}
$
${USER}
\
`
id
-un
2> /dev/null
`
;
do
\
[
-n
"
$
${installuser}
"
]
&&
break
;
\
done
;
\
$(set_installuser)
;
\
chown
$
${installuser}
DOC
*
;
chmod
a+r DOC
*
;
\
if
test
"
`
echo
DOC-
*
`
"
!=
"DOC-*"
;
then
rm
-f
DOC
;
fi
)
;
\
else
true
;
fi
...
...
@@ -527,10 +523,7 @@ install-arch-indep: mkdir info install-etc
(
cd
lisp
;
tar
-chf
-
*
.el
*
.elc
)
\
|
(
cd
$(DESTDIR)${lispdir}
;
umask
022
;
tar
-xvf
-
&&
cat
>
/dev/null
)
||
exit
1
;
\
(
cd
$(DESTDIR)${lispdir}
;
\
for
installuser
in
$
${LOGNAME}
$
${USERNAME}
$
${USER}
\
`
id
-un
2> /dev/null
`
;
do
\
[
-n
"
$
${installuser}
"
]
&&
break
;
\
done
;
\
$(set_installuser)
;
\
find
.
-exec
chown
$
${installuser}
{}
';'
)
;
\
else
true
;
fi
-
unset
CDPATH
;
\
...
...
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