Skip to content

Commit 1043cd3

Browse files
committed
Fix out-of-source make-dist problems
Problem with jisx2131-filter reported by Phillip Lord in: https://lists.gnu.org/r/emacs-devel/2019-06/msg00147.html * admin/charsets/Makefile.in (SED_SCRIPT): Put it in $(srcdir), which is not necessarily the working directory. ($(SED_SCRIPT)): Rename from jisx2131-filter. All uses changed. (clean): Do not remove SED_SCRIPT. (extraclean): Remove it here instead. * make-dist (possibly_non_vc_files): Remove src/emacs-module.h. Although it is portable and could be distributed in the tarball, it's too much hassle to do that, so let each builder make it.
1 parent d26b49e commit 1043cd3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

admin/charsets/Makefile.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ MULE = MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
9696
MULE-sisheng.map MULE-tibetan.map \
9797
MULE-lviscii.map MULE-uviscii.map
9898

99-
SED_SCRIPT = jisx2131-filter
99+
SED_SCRIPT = $(srcdir)/jisx2131-filter
100100

101101
TRANS_TABLE = cp51932.el eucjp-ms.el
102102
TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE})
@@ -200,12 +200,13 @@ ${charsetdir}/JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv}
200200
${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact}
201201
${AM_V_GEN}${run_mapconv} $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 ${compact} > $@
202202

203-
jisx2131-filter: ${mapfiledir}/JISX213A.map
203+
$(SED_SCRIPT): ${mapfiledir}/JISX213A.map
204204
${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
205205

206-
${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} jisx2131-filter
206+
${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} \
207+
$(SED_SCRIPT)
207208
${AM_V_GEN}${run_mapconv} $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \
208-
| sed -f jisx2131-filter \
209+
| sed -f $(SED_SCRIPT) \
209210
| sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
210211

211212
${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv}
@@ -307,7 +308,6 @@ ${charsetdir}/%.map: ${GLIBC_CHARMAPS}/%.gz ${mapconv} ${compact}
307308
.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
308309

309310
clean:
310-
rm -f ${SED_SCRIPT}
311311

312312
bootstrap-clean: clean
313313

@@ -318,4 +318,4 @@ maintainer-clean: distclean
318318

319319
## Do not remove these files, even in a bootstrap. They rarely change.
320320
extraclean:
321-
rm -f ${CHARSETS} ${TRANS_TABLE} ${srcdir}/charsets.stamp
321+
rm -f ${CHARSETS} ${SED_SCRIPT} ${TRANS_TABLE} ${srcdir}/charsets.stamp

make-dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ possibly_non_vc_files="
371371
$top_level_ChangeLog
372372
MANIFEST aclocal.m4 configure
373373
admin/charsets/jisx2131-filter
374-
src/config.in src/emacs-module.h
374+
src/config.in
375375
"$(
376376
find admin doc etc lisp \
377377
\( -name '*.el' -o -name '*.elc' -o -name '*.map' -o -name '*.stamp' \

0 commit comments

Comments
 (0)