mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-29 00:31:01 -08:00
(do-install): Correct previous etc-copying change.
(src/Makefile): Insert --x-libraries option into LD_SWITCH_X_SITE.
This commit is contained in:
parent
7b7a9d23d4
commit
acfb884cec
1 changed files with 4 additions and 3 deletions
|
|
@ -278,6 +278,7 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile
|
|||
-e 's|^CC *=.*$$|CC='"${CC}"'|' \
|
||||
-e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|' \
|
||||
-e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \
|
||||
-e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1'"${LD_SWITCH_X_SITE}"'|' \
|
||||
-e '/^# DIST: /d') > src/Makefile.tmp
|
||||
@${srcdir}/move-if-change src/Makefile.tmp src/Makefile
|
||||
chmod -w src/Makefile
|
||||
|
|
@ -348,9 +349,9 @@ do-install: mkdir
|
|||
rm -f $${subdir}/*~ ; \
|
||||
done) ; \
|
||||
done
|
||||
[ `(cd etc; /bin/pwd)` != `(cd ${srcdir}/etc; /bin/pwd)` ] \
|
||||
&& (echo "Copying etc/DOC* ..." ; \
|
||||
(cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - ))
|
||||
-[ `(cd ./etc; /bin/pwd)` != `(cd ${srcdir}etc; /bin/pwd)` ] \
|
||||
&& (echo "Copying etc/DOC* ..." ; \
|
||||
(cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - ))
|
||||
-[ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ] \
|
||||
&& (cd ${srcdir}/info ; \
|
||||
if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue