mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Fix previous commit.

Browse Source 
config.bat: Use config.in and Makefile.in from src/ and lib/, if
 they exist there, else from autogen/.
 make-dist: Don't add `autogen'.
This commit is contained in:
Eli Zaretskii 2011-10-31 19:49:10 +02:00
parent 0bd3cb7b2f
commit 07f3add98f
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,9 +1,9 @@
2011-10-31 Eli Zaretskii <eliz@gnu.org> 2011-10-31 Eli Zaretskii <eliz@gnu.org>
* make-dist (tempdir): Create `autogen'. * config.bat: Use config.in and Makefile.in from src/ and lib/, if
(msdos): Add depfiles.bat and inttypes.h. they exist there, else from autogen/.
(autogen): Put README, config.in, and Makefile.in ionto the
distribution, they are needed for the MS-DOS build. * make-dist (msdos): Add depfiles.bat and inttypes.h.
2011-10-25 Nali Toja <nalitoja@gmail.com> (tiny change) 2011-10-25 Nali Toja <nalitoja@gmail.com> (tiny change)

9
config.bat
View File

@ -156,9 +156,11 @@ rm -f epaths.tmp
rem Create "config.h" rem Create "config.h"
rm -f config.h2 config.tmp rm -f config.h2 config.tmp
sed -e '' ../autogen/config.in > config.tmp if exist config.in sed -e '' config.in > config.tmp
if exist ..\autogen\config.in sed -e '' ../autogen/config.in > config.tmp
if "%X11%" == "" goto src4 if "%X11%" == "" goto src4
sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp if exist config.in sed -f ../msdos/sed2x.inp < config.in > config.tmp
if exist ..\autogen\config.in sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp
:src4 :src4
sed -f ../msdos/sed2v2.inp <config.tmp >config.h2 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
Rem See if DECL_ALIGN can be supported with this GCC Rem See if DECL_ALIGN can be supported with this GCC
@ -290,7 +292,8 @@ If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
If Exist time.in.h update time.in.h time.in-h If Exist time.in.h update time.in.h time.in-h
If Exist unistd.in.h update unistd.in.h unistd.in-h If Exist unistd.in.h update unistd.in.h unistd.in-h
sed -f ../msdos/sedlibcf.inp < ..\autogen\Makefile.in > makefile.tmp If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
If Exist ..\autogen\Makefile.in sed -f ../msdos/sedlibcf.inp < ..\autogen\Makefile.in > makefile.tmp
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
rm -f makefile.tmp rm -f makefile.tmp
Rem Create .Po files for new files in lib/ Rem Create .Po files for new files in lib/

6
make-dist
View File

@ -297,7 +297,7 @@ for subdir in site-lisp \
nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
`find etc lisp admin -type d` \ `find etc lisp admin -type d` \
doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
info m4 msdos autogen \ info m4 msdos \
nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \
nextstep/Cocoa/Emacs.base/Contents \ nextstep/Cocoa/Emacs.base/Contents \
nextstep/Cocoa/Emacs.base/Contents/Resources \ nextstep/Cocoa/Emacs.base/Contents/Resources \
@ -422,10 +422,6 @@ echo "Making links to \`msdos'"
ln depfiles.bat inttypes.h ../${tempdir}/msdos ln depfiles.bat inttypes.h ../${tempdir}/msdos
ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos) ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos)
echo "Making links to \`autogen'"
(cd autogen
ln README config.in Makefile.in ../${tempdir}/autogen)
echo "Making links to \`nextstep'" echo "Making links to \`nextstep'"
(cd nextstep (cd nextstep
ln ChangeLog README INSTALL ../${tempdir}/nextstep) ln ChangeLog README INSTALL ../${tempdir}/nextstep)