summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-19 23:47:26 +0000
committerKarl Berry <karl@freefriends.org>2012-05-19 23:47:26 +0000
commit91870f4aa72508cb121819609144a0f939be4379 (patch)
treea0495bfac7aff23bb7a1b5f73253a0dd160c394d
parentb078ddfa377ff52fad63f69b0517dae44c4c006b (diff)
do not handle pmx2pdf.lua here
git-svn-id: svn://tug.org/texlive/trunk@26494 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/pmx/ChangeLog6
-rw-r--r--Build/source/utils/pmx/Makefile.am14
-rw-r--r--Build/source/utils/pmx/Makefile.in196
3 files changed, 41 insertions, 175 deletions
diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog
index abd84a025e9..bc205644dfb 100644
--- a/Build/source/utils/pmx/ChangeLog
+++ b/Build/source/utils/pmx/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-20 Karl Berry <karl@tug.org>
+
+ * Makefile.am: do not handle pmx2pdf.lua here, since
+ it is distributed as part of the texmf.zip file rather than the
+ sources.
+
2012-05-18 Karl Berry <karl@tug.org>
* pmx-2.6.18.
diff --git a/Build/source/utils/pmx/Makefile.am b/Build/source/utils/pmx/Makefile.am
index 117121f71fb..17cef19b860 100644
--- a/Build/source/utils/pmx/Makefile.am
+++ b/Build/source/utils/pmx/Makefile.am
@@ -235,20 +235,6 @@ EXTRA_libf2c_a_SOURCES += \
EXTRA_libf2c_a_SOURCES += \
$(PMX_TREE)/libf2c/signbit.c
-lua_scripts = pmx2pdf
-
-scriptsdir = texmf-dist/scripts/pmx
-nodist_bin_SCRIPTS =
-
-include $(srcdir)/../../texk/am/script_links.am
-
-texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(lua_scripts:=.lua)
-
-install-data-hook: install-lua-links
-
-uninstall-hook: uninstall-links
-
dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1
## Tests
diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in
index b96e46f01c4..55dce6533f0 100644
--- a/Build/source/utils/pmx/Makefile.in
+++ b/Build/source/utils/pmx/Makefile.in
@@ -16,7 +16,6 @@
@SET_MAKE@
-
VPATH = @srcdir@
am__make_dryrun = \
{ \
@@ -53,8 +52,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
bin_PROGRAMS = pmxab$(EXEEXT) scor2prt$(EXEEXT)
@WIN32_TRUE@am__append_1 = w32getc.c
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
- $(dist_texmf_SCRIPTS) $(srcdir)/../../texk/am/script_links.am \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -63,8 +62,6 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
../../build-aux/depcomp ../../build-aux/install-sh \
../../build-aux/ltmain.sh ../../build-aux/missing \
../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
-@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_2 = $(wrappers)
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
@@ -213,8 +210,7 @@ am_libf2c_a_OBJECTS = abort_.$(OBJEXT) cabs.$(OBJEXT) derf_.$(OBJEXT) \
xwsne.$(OBJEXT) dtime_.$(OBJEXT) etime_.$(OBJEXT) \
$(am__objects_1)
libf2c_a_OBJECTS = $(am_libf2c_a_OBJECTS)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
am_pmxab_OBJECTS = pmxab.$(OBJEXT)
pmxab_OBJECTS = $(am_pmxab_OBJECTS)
@@ -224,6 +220,23 @@ am_scor2prt_OBJECTS = scor2prt.$(OBJEXT)
scor2prt_OBJECTS = $(am_scor2prt_OBJECTS)
scor2prt_LDADD = $(LDADD)
scor2prt_DEPENDENCIES = libf2c.a
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libf2c_a_SOURCES) $(EXTRA_libf2c_a_SOURCES) \
+ $(pmxab_SOURCES) $(scor2prt_SOURCES)
+DIST_SOURCES = $(am__libf2c_a_SOURCES_DIST) $(EXTRA_libf2c_a_SOURCES) \
+ $(pmxab_SOURCES) $(scor2prt_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -251,24 +264,6 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-SCRIPTS = $(dist_texmf_SCRIPTS) $(nodist_bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libf2c_a_SOURCES) $(EXTRA_libf2c_a_SOURCES) \
- $(pmxab_SOURCES) $(scor2prt_SOURCES)
-DIST_SOURCES = $(am__libf2c_a_SOURCES_DIST) $(EXTRA_libf2c_a_SOURCES) \
- $(pmxab_SOURCES) $(scor2prt_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(dist_man1_MANS)
@@ -390,8 +385,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES ../../build-aux/relpath \
- $(TESTS) tests/barsant.mid tests/barsant.pml tests/barsant.pmx \
+EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES $(TESTS) \
+ tests/barsant.mid tests/barsant.pml tests/barsant.pmx \
tests/barsant.tex tests/barsant1.pmx tests/barsant2.pmx
INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c
AM_CFLAGS = #$(WARNING_CFLAGS)
@@ -484,14 +479,6 @@ EXTRA_libf2c_a_SOURCES = $(PMX_TREE)/libf2c/uninit.c \
$(PMX_TREE)/libf2c/ftell64_.c $(PMX_TREE)/libf2c/pow_qq.c \
$(PMX_TREE)/libf2c/qbitbits.c $(PMX_TREE)/libf2c/qbitshft.c \
$(PMX_TREE)/libf2c/signbit.c
-lua_scripts = pmx2pdf
-scriptsdir = texmf-dist/scripts/pmx
-nodist_bin_SCRIPTS = $(am__append_2)
-all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
-texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(lua_scripts:=.lua)
dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1
TESTS = pmx.test
DISTCLEANFILES = barsant* pmxaerr.dat
@@ -501,7 +488,7 @@ all: all-am
.SUFFIXES: .c .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -524,7 +511,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../texk/am/script_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -587,76 +573,6 @@ pmxab$(EXEEXT): $(pmxab_OBJECTS) $(pmxab_DEPENDENCIES) $(EXTRA_pmxab_DEPENDENCIE
scor2prt$(EXEEXT): $(scor2prt_OBJECTS) $(scor2prt_DEPENDENCIES) $(EXTRA_scor2prt_DEPENDENCIES)
@rm -f scor2prt$(EXEEXT)
$(LINK) $(scor2prt_OBJECTS) $(scor2prt_LDADD) $(LIBS)
-install-dist_texmfSCRIPTS: $(dist_texmf_SCRIPTS)
- @$(NORMAL_INSTALL)
- @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n' \
- -e 'h;s|.*|.|' \
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
- if (++n[d] == $(am__install_max)) { \
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
- else { print "f", d "/" $$4, $$1 } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-dist_texmfSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir)
-install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
- @$(NORMAL_INSTALL)
- @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n' \
- -e 'h;s|.*|.|' \
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
- if (++n[d] == $(am__install_max)) { \
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
- else { print "f", d "/" $$4, $$1 } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-nodist_binSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -3465,9 +3381,9 @@ distcleancheck: distclean
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS)
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -3525,14 +3441,13 @@ info: info-am
info-am:
-install-data-am: install-dist_texmfSCRIPTS install-man
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am: install-man
+
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
+install-exec-am: install-binPROGRAMS
install-html: install-html-am
@@ -3573,13 +3488,11 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_texmfSCRIPTS \
- uninstall-man uninstall-nodist_binSCRIPTS
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+uninstall-am: uninstall-binPROGRAMS uninstall-man
+
uninstall-man: uninstall-man1
-.MAKE: check-am install-am install-data-am install-strip uninstall-am
+.MAKE: check-am install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
clean clean-binPROGRAMS clean-cscope clean-generic \
@@ -3589,59 +3502,20 @@ uninstall-man: uninstall-man1
distclean-generic distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
- install-data-am install-data-hook install-dist_texmfSCRIPTS \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-man1 install-nodist_binSCRIPTS install-pdf \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-dist_texmfSCRIPTS \
- uninstall-hook uninstall-man uninstall-man1 \
- uninstall-nodist_binSCRIPTS
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
-.PHONY: install-lua-links install-perl-links install-shell-links \
- install-links uninstall-links
-@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@
-
-install-lua-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
-
-install-perl-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
-
-install-shell-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
-
-# We support native builds, multiplatform or not, as well as distro builds.
-install-links:
- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
- if test -z "$$REL"; then \
- echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
- exit 1; \
- fi; \
- cd $(DESTDIR)$(bindir) && \
- for f in $($(TYPE)_scripts); do \
- rm -f $$f; \
- echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
- done
-
-uninstall-links:
-@WIN32_FALSE@ @for f in $(all_scripts); do \
-@WIN32_FALSE@ echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-@WIN32_FALSE@ done
-
-install-data-hook: install-lua-links
-
-uninstall-hook: uninstall-links
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.