From 545fc4a8a545571c6c014897a161a6f72260766b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 18 Apr 2009 18:11:57 +0000 Subject: make and install the psutils scripts and man pages, too git-svn-id: svn://tug.org/texlive/trunk@12747 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/psutils/ChangeLog | 4 + Build/source/utils/psutils/Makefile.am | 79 ++++++++------ Build/source/utils/psutils/Makefile.in | 193 ++++++++++++++++++++++++++++----- 3 files changed, 217 insertions(+), 59 deletions(-) (limited to 'Build/source') diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog index 3527b0a957b..ef8828209a0 100644 --- a/Build/source/utils/psutils/ChangeLog +++ b/Build/source/utils/psutils/ChangeLog @@ -1,3 +1,7 @@ +2009-04-18 Karl Berry + + * Makefile.am: also make and install all the scripts and man pages. + 2008-02-29 Peter Breitenlohner * configure.in: update (AC_SET_MAKE -> AC_PROG_MAKE_SET). diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am index ae222da2bfc..8843bf8ea34 100644 --- a/Build/source/utils/psutils/Makefile.am +++ b/Build/source/utils/psutils/Makefile.am @@ -1,10 +1,36 @@ ## OS = UNIX PAPER = a4 +CHMOD = chmod +BINMODE = +x AM_CPPFLAGS = -DUNIX -DPAPER=\"$(PAPER)\" bin_PROGRAMS = epsffit psbook psnup psresize psselect pstops +bin_SCRIPTS = getafm showchar \ + extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \ + fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge +CLEANFILES = $(bin_SCRIPTS) + +PERL = /usr/bin/env perl +MAKETEXT = $(PERL) $(srcdir)/maketext + +man1_MANS = epsffit.1 psbook.1 psnup.1 psresize.1 psselect.1 pstops.1 \ + getafm.1 \ + extractres.1 fixdlsrps.man fixfmps.man fixmacps.man \ + fixpsditps.man fixpspps.man fixscribeps.man fixtpps.man \ + fixwfwps.man fixwpps.man fixwwps.man includeres.man psmerge.man +dist_man_MANS = $(man1_MANS) + +%: %.pl + $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@ + +%: %.sh + cp $< $@ + $(CHMOD) $(BINMODE) $@ + +%.1: %.man + $(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@ epsffit_SOURCES = \ config.h \ @@ -57,60 +83,45 @@ pstops_SOURCES = \ psutil.c \ psutil.h +## EXTRA_DIST = \ LICENSE -## Not used -## +# scripts. EXTRA_DIST += \ - Makefile.bcc \ - Makefile.msc \ - Makefile.nt \ - Makefile.os2 \ - Makefile.sc \ - Makefile.unix \ - Makefile.wat \ - descrip.mms \ - epsffit.man \ - extractres.man \ + getafm.sh \ + showchar.sh \ extractres.pl \ - fixdlsrps.man \ fixdlsrps.pl \ - fixfmps.man \ fixfmps.pl \ - fixmacps.man \ fixmacps.pl \ - fixpsditps.man \ fixpsditps.pl \ - fixpspps.man \ fixpspps.pl \ - fixscribeps.man \ fixscribeps.pl \ - fixtpps.man \ fixtpps.pl \ - fixwfwps.man \ fixwfwps.pl \ - fixwpps.man \ fixwpps.pl \ - fixwwps.man \ fixwwps.pl \ - getafm.man \ - getafm.sh \ - includeres.man \ includeres.pl \ + psmerge.pl \ +# + +## Not used +## +EXTRA_DIST += \ + Makefile.bcc \ + Makefile.msc \ + Makefile.nt \ + Makefile.os2 \ + Makefile.sc \ + Makefile.unix \ + Makefile.wat \ + descrip.mms \ maketext \ md68_0.ps \ md71_0.ps \ - psbook.man \ - psnup.man \ - psmerge.man \ - psmerge.pl \ - psresize.man \ - psselect.man \ - pstops.man \ - showchar.sh +# ## Eventually delete these files ## EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in index d422f297c37..ecfdcad4984 100644 --- a/Build/source/utils/psutils/Makefile.in +++ b/Build/source/utils/psutils/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,7 +34,7 @@ POST_UNINSTALL = : bin_PROGRAMS = epsffit$(EXEEXT) psbook$(EXEEXT) psnup$(EXEEXT) \ psresize$(EXEEXT) psselect$(EXEEXT) pstops$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) \ +DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ @@ -51,7 +52,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = patchlev.h -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(manmdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_epsffit_OBJECTS = epsffit.$(OBJEXT) pserror.$(OBJEXT) @@ -77,6 +79,8 @@ am_pstops_OBJECTS = pserror.$(OBJEXT) psspec.$(OBJEXT) \ pstops.$(OBJEXT) psutil.$(OBJEXT) pstops_OBJECTS = $(am_pstops_OBJECTS) pstops_LDADD = $(LDADD) +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -88,6 +92,10 @@ SOURCES = $(epsffit_SOURCES) $(psbook_SOURCES) $(psnup_SOURCES) \ $(psresize_SOURCES) $(psselect_SOURCES) $(pstops_SOURCES) DIST_SOURCES = $(epsffit_SOURCES) $(psbook_SOURCES) $(psnup_SOURCES) \ $(psresize_SOURCES) $(psselect_SOURCES) $(pstops_SOURCES) +man1dir = $(mandir)/man1 +manmdir = $(mandir)/manm +NROFF = nroff +MANS = $(dist_man_MANS) $(man1_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -186,7 +194,23 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OS = UNIX PAPER = a4 +CHMOD = chmod +BINMODE = +x AM_CPPFLAGS = -DUNIX -DPAPER=\"$(PAPER)\" +bin_SCRIPTS = getafm showchar \ + extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \ + fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge + +CLEANFILES = $(bin_SCRIPTS) +PERL = /usr/bin/env perl +MAKETEXT = $(PERL) $(srcdir)/maketext +man1_MANS = epsffit.1 psbook.1 psnup.1 psresize.1 psselect.1 pstops.1 \ + getafm.1 \ + extractres.1 fixdlsrps.man fixfmps.man fixmacps.man \ + fixpsditps.man fixpspps.man fixscribeps.man fixtpps.man \ + fixwfwps.man fixwpps.man fixwwps.man includeres.man psmerge.man + +dist_man_MANS = $(man1_MANS) epsffit_SOURCES = \ config.h \ epsffit.c \ @@ -238,17 +262,12 @@ pstops_SOURCES = \ psutil.c \ psutil.h -EXTRA_DIST = LICENSE Makefile.bcc Makefile.msc Makefile.nt \ - Makefile.os2 Makefile.sc Makefile.unix Makefile.wat \ - descrip.mms epsffit.man extractres.man extractres.pl \ - fixdlsrps.man fixdlsrps.pl fixfmps.man fixfmps.pl fixmacps.man \ - fixmacps.pl fixpsditps.man fixpsditps.pl fixpspps.man \ - fixpspps.pl fixscribeps.man fixscribeps.pl fixtpps.man \ - fixtpps.pl fixwfwps.man fixwfwps.pl fixwpps.man fixwpps.pl \ - fixwwps.man fixwwps.pl getafm.man getafm.sh includeres.man \ - includeres.pl maketext md68_0.ps md71_0.ps psbook.man \ - psnup.man psmerge.man psmerge.pl psresize.man psselect.man \ - pstops.man showchar.sh Makefile.in.orig configure.in.orig + +# scripts. +# + +# +EXTRA_DIST = LICENSE Makefile.in.orig configure.in.orig all: all-am .SUFFIXES: @@ -329,6 +348,25 @@ psselect$(EXEEXT): $(psselect_OBJECTS) $(psselect_DEPENDENCIES) pstops$(EXEEXT): $(pstops_OBJECTS) $(pstops_DEPENDENCIES) @rm -f pstops$(EXEEXT) $(LINK) $(pstops_OBJECTS) $(pstops_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -359,6 +397,96 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $$i; then file=$$i; \ + else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-manm: $(manm_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(manmdir)" || $(MKDIR_P) "$(DESTDIR)$(manmdir)" + @list='$(manm_MANS) $(dist_manm_MANS) $(nodist_manm_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.m*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $$i; then file=$$i; \ + else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + m*) ;; \ + *) ext='m' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(manmdir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(manmdir)/$$inst"; \ + done +uninstall-manm: + @$(NORMAL_UNINSTALL) + @list='$(manm_MANS) $(dist_manm_MANS) $(nodist_manm_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.m*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + m*) ;; \ + *) ext='m' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(manmdir)/$$inst'"; \ + rm -f "$(DESTDIR)$(manmdir)/$$inst"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -540,9 +668,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(manmdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -562,6 +690,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -590,17 +719,17 @@ info: info-am info-am: -install-data-am: +install-data-am: install-man install-dvi: install-dvi-am -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-html: install-html-am install-info: install-info-am -install-man: +install-man: install-man1 install-manm install-pdf: install-pdf-am @@ -627,7 +756,9 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man + +uninstall-man: uninstall-man1 uninstall-manm .MAKE: install-am install-strip @@ -637,15 +768,27 @@ uninstall-am: uninstall-binPROGRAMS distclean distclean-compile 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-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-binSCRIPTS install-data 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-manm 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-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-man uninstall-man1 uninstall-manm + + +%: %.pl + $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@ + +%: %.sh + cp $< $@ + $(CHMOD) $(BINMODE) $@ +%.1: %.man + $(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@ # 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. .NOEXPORT: -- cgit v1.2.3