From 500d901afe05d800e07612748575265114e89c42 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 15 May 2019 18:56:59 +0200 Subject: [PATCH] install perl files as well --- MANIFEST | 12 ++++++------ example/Makefile | 2 +- example/filelist | 12 ++++++------ tools/Makefile | 6 +++++- tools/{bootstrap => bootstrap.pl} | 0 tools/{bootstrap2 => bootstrap2.pl} | 0 tools/{makemanifest => makemanifest.pl} | 0 tools/{psgen => psgen.pl} | 4 +++- tools/{sortpages => sortpages.pl} | 0 tools/{yapp => yapp.pl} | 0 10 files changed, 21 insertions(+), 15 deletions(-) rename tools/{bootstrap => bootstrap.pl} (100%) mode change 100755 => 100644 rename tools/{bootstrap2 => bootstrap2.pl} (100%) mode change 100755 => 100644 rename tools/{makemanifest => makemanifest.pl} (100%) mode change 100755 => 100644 rename tools/{psgen => psgen.pl} (99%) mode change 100755 => 100644 rename tools/{sortpages => sortpages.pl} (100%) mode change 100755 => 100644 rename tools/{yapp => yapp.pl} (100%) mode change 100755 => 100644 diff --git a/MANIFEST b/MANIFEST index 409dee8..0814adc 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2,9 +2,9 @@ 2 MANIFEST D books/ D books/tools/ -3 bootstrap -4 bootstrap2 -5 sortpages +3 bootstrap.pl +4 bootstrap2.pl +5 sortpages.pl 6 Makefile 7 heap.c 8 heap.h @@ -18,9 +18,9 @@ D books/tools/ 16 unmunge.c 17 munge.c 18 yapp.doc -19 yapp -20 psgen -21 makemanifest +19 yapp.pl +20 psgen.pl +21 makemanifest.pl D books/ps/ 22 prolog.ps 23 charmap.ps diff --git a/example/Makefile b/example/Makefile index be398bc..d032968 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,5 +1,5 @@ BOOKROOT = .. -TOOLSDIR = $(BOOKROOT)/tools +TOOLSDIR = $(BOOKROOT)/tools/bin PSDIR = $(BOOKROOT)/ps YAPP = $(TOOLSDIR)/yapp diff --git a/example/filelist b/example/filelist index c2ef0f9..768a236 100644 --- a/example/filelist +++ b/example/filelist @@ -2,9 +2,9 @@ V 1 8 T MANIFEST D books/ D books/tools/ -T books/tools/bootstrap -T books/tools/bootstrap2 -T4 books/tools/sortpages +T books/tools/bootstrap.pl +T books/tools/bootstrap2.pl +T4 books/tools/sortpages.pl T books/tools/Makefile T books/tools/heap.c T books/tools/heap.h @@ -18,9 +18,9 @@ T books/tools/subst.h T books/tools/unmunge.c T books/tools/munge.c T books/tools/yapp.doc -T4 books/tools/yapp -T4 books/tools/psgen -T4 books/tools/makemanifest +T4 books/tools/yapp.pl +T4 books/tools/psgen.pl +T4 books/tools/makemanifest.pl D books/ps/ T books/ps/prolog.ps T books/ps/charmap.ps diff --git a/tools/Makefile b/tools/Makefile index 40e49d7..dcbe31e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,6 +3,7 @@ OBJ = obj DIRS = $(BIN) $(OBJ) CFLAGS = -g -O -W -Wall +PERL = $(addprefix $(BIN)/, bootstrap bootstrap2 makemanifest psgen sortpages yapp) BINS = $(addprefix $(BIN)/, unmunge munge repair) UNMUNGE_OBJS = $(addprefix $(OBJ)/, util.o unmunge.o) MUNGE_OBJS = $(addprefix $(OBJ)/, util.o munge.o) @@ -10,7 +11,10 @@ REPAIR_OBJS = $(addprefix $(OBJ)/, util.o heap.o mempool.o subst.o repair.o) $(shell mkdir -p $(DIRS)) -all: $(BINS) +all: $(BINS) $(PERL) + +$(BIN)/%: %.pl + cp $< $@; chmod +x $@ $(BIN)/unmunge: $(UNMUNGE_OBJS) $(CC) $(CFLAGS) -o $@ $(UNMUNGE_OBJS) diff --git a/tools/bootstrap b/tools/bootstrap.pl old mode 100755 new mode 100644 similarity index 100% rename from tools/bootstrap rename to tools/bootstrap.pl diff --git a/tools/bootstrap2 b/tools/bootstrap2.pl old mode 100755 new mode 100644 similarity index 100% rename from tools/bootstrap2 rename to tools/bootstrap2.pl diff --git a/tools/makemanifest b/tools/makemanifest.pl old mode 100755 new mode 100644 similarity index 100% rename from tools/makemanifest rename to tools/makemanifest.pl diff --git a/tools/psgen b/tools/psgen.pl old mode 100755 new mode 100644 similarity index 99% rename from tools/psgen rename to tools/psgen.pl index f3309a8..ae585ea --- a/tools/psgen +++ b/tools/psgen.pl @@ -18,8 +18,10 @@ # $Id: psgen,v 1.18 1997/11/13 21:44:16 colin Exp $ # +use File::Basename; + $bookRoot = $ENV{"BOOKROOT"} || "."; -$toolsDir = "$bookRoot/tools"; +$toolsDir = dirname(__FILE__); $psDir = "$bookRoot/ps"; $editor = $ENV{"EDITOR"} || "vi"; diff --git a/tools/sortpages b/tools/sortpages.pl old mode 100755 new mode 100644 similarity index 100% rename from tools/sortpages rename to tools/sortpages.pl diff --git a/tools/yapp b/tools/yapp.pl old mode 100755 new mode 100644 similarity index 100% rename from tools/yapp rename to tools/yapp.pl