From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?iso-8859-15?q?J=E9r=F4me_Marant?= Newsgroups: gmane.emacs.devel Subject: [PATCH] make-dist fixes and clean-ups Date: Sat, 30 Apr 2005 13:04:49 +0200 Message-ID: <87vf64bk4u.fsf@marant.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1114946582 29874 80.91.229.2 (1 May 2005 11:23:02 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 1 May 2005 11:23:02 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 01 13:23:00 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DSCX4-0000vP-PY for ged-emacs-devel@m.gmane.org; Sun, 01 May 2005 13:22:43 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DSCdl-0000MU-As for ged-emacs-devel@m.gmane.org; Sun, 01 May 2005 07:29:37 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DSCdb-0000MF-TM for emacs-devel@gnu.org; Sun, 01 May 2005 07:29:27 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DSCdb-0000Lp-E3 for emacs-devel@gnu.org; Sun, 01 May 2005 07:29:27 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DSCdb-0000AU-AM for emacs-devel@gnu.org; Sun, 01 May 2005 07:29:27 -0400 Original-Received: from [213.228.0.176] (helo=postfix4-2.free.fr) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DSCgg-0006GA-Fu for emacs-devel@gnu.org; Sun, 01 May 2005 07:32:38 -0400 Original-Received: from amboise (mol92-4-82-227-97-206.fbx.proxad.net [82.227.97.206]) by postfix4-2.free.fr (Postfix) with ESMTP id 6EAAC1B7F27 for ; Sun, 1 May 2005 13:28:06 +0200 (CEST) Original-Received: by amboise (Postfix, from userid 1000) id 94DB22C05F; Sun, 1 May 2005 13:28:41 +0200 (CEST) Resent-To: emacs-devel@gnu.org Resent-From: =?iso-8859-15?q?J=E9r=F4me_Marant?= Resent-Date: Sun, 01 May 2005 13:28:41 +0200 Resent-Message-ID: <87acnf423a.fsf@marant.org> X-From-Line: nobody Sat Apr 30 13:04:49 2005 Original-To: emacs-devel@gnu.org User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) Original-Lines: 114 Resent-Date: Sun, 01 May 2005 07:29:27 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:36514 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:36514 Hi, I've created a script which automatically builds Debian packages from a distribution tarball generated from make-dist. I think it is going further than just bootstraping from a CVS checkout. Hence, I had to make the following changes to make-dist. Cheers, --- ChangeLog.orig 2005-04-29 22:07:02.000000000 +0200 +++ ChangeLog 2005-04-30 10:37:44.206768056 +0200 @@ -1,3 +1,10 @@ +2005-04-29 J=E9r=F4me Marant + + * make-dist: Remove any reference to makefile.nt and + makefile.def. + Properly install etc subdirectories. + Do not remove ldefs-boot.el. + 2005-04-23 Andreas Schwab =20 * configure.in: Remove duplicate match for powerpc configuration. --- make-dist.orig 2005-04-29 21:59:44.000000000 +0200 +++ make-dist 2005-04-30 10:37:52.198553120 +0200 @@ -321,7 +321,9 @@ leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - etc etc/e info man msdos vms mac mac/inc mac/inc/sys \ + etc etc/e etc/images etc/images/gnus etc/images/smilies \ + etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \ + info man msdos vms mac mac/inc mac/inc/sys \ mac/src mac/Emacs.app mac/Emacs.app/Contents \ mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ mac/Emacs.app/Contents/Resources/English.lproj @@ -349,7 +351,6 @@ test -f README && ln README ../${tempdir}/lisp (cd ../${tempdir}/lisp rm -f TAGS =3D* - rm -f ldefs-boot.el rm -f site-init site-init.el site-init.elc rm -f site-load site-load.el site-load.elc rm -f site-start site-start.el site-start.elc @@ -396,7 +397,7 @@ echo "Making links to \`leim' and its subdirectories" ### Don't distribute TAGS, or =3D*.el files. (cd leim - ln makefile.nt makefile.w32-in ../${tempdir}/leim + ln makefile.w32-in ../${tempdir}/leim ln ChangeLog README ../${tempdir}/leim =20 ln CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC @@ -443,7 +444,7 @@ fi done ln README ChangeLog ChangeLog.*[0-9] ../${tempdir}/src - ln makefile.nt makefile.w32-in ../${tempdir}/src + ln makefile.w32-in ../${tempdir}/src ln .gdbinit .dbxinit ../${tempdir}/src cd ../${tempdir}/src rm -f config.h epaths.h Makefile Makefile.c @@ -466,7 +467,7 @@ (cd lib-src ln [a-zA-Z]*.[chy] ../${tempdir}/lib-src ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src - ln grep-changelog rcs2log rcs-checkin makefile.nt ../${tempdir}/lib-src + ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src ln makefile.w32-in ../${tempdir}/lib-src ## If we ended up with a symlink, or if we did not get anything ## due to a cross-device symlink, copy the file. @@ -492,7 +493,7 @@ (cd nt ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt - ln [a-z]*.bat [a-z]*.h makefile.def makefile.nt ../${tempdir}/nt + ln [a-z]*.bat [a-z]*.h ../${tempdir}/nt ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) =20 echo "Making links to \`nt/inc'" @@ -563,7 +564,8 @@ ### tex litter. ### Don't distribute gfdl.1, since no man page references it. (cd etc - files=3D`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^= e$'` + files=3D`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^= e$' \ + | grep -v '^images$' | grep -v '^tree-widget$'` ln $files ../${tempdir}/etc ## If we ended up with a symlink, or if we did not get anything ## due to a cross-device symlink, copy the file. @@ -592,6 +594,15 @@ cd ../../${tempdir}/etc/e rm -f *~ \#*\# *,v =3D* core) =20 +for dir in etc/images/gnus etc/images/smilies \ + etc/tree-widget/default etc/tree-widget/folder ; do + echo "Making links to \`${dir}'" + (cd ${dir} + ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir} + cd ../../../${tempdir}/${dir} + rm -f *~ \#*\# *,v =3D* core) +done + echo "Making links to \`info'" # Don't distribute backups or autosaves. (cd info --=20 J=E9r=F4me Marant