1 diff -Nru epic4-2000/Makefile.in epic4-2000.new/Makefile.in
2 --- epic4-2000/Makefile.in Mon Nov 22 19:05:03 1999
3 +++ epic4-2000.new/Makefile.in Thu May 11 02:12:28 2000
8 -epic_exe = $(bindir)/$(epic)
9 -wserv_exe = $(libexecdir)/wserv
10 -epicdir = $(sharedir)/$(epic)
15 ############ You ought not change anything below this line ###################
18 epic: source/Makefile Makefile
19 @cd source; $(MAKE2) all
21 -EPIC = $(epic_exe)-$(VERSION)
23 EPIC_OLD = $(epic_exe).old
24 EPIC_LINK = $(epic_exe)
25 installepic installirc: epic installdirs test
26 - if ./my_test \( ! -f $(IP)$(EPIC) \) \
27 - -o source/epic -nt $(IP)$(EPIC); then \
28 - $(INSTALL_PROGRAM) source/epic $(IP)$(EPIC); \
29 - if ./my_test -f $(IP)$(EPIC_OLD); then \
30 - $(RM) $(IP)$(EPIC_OLD); \
32 - if ./my_test -f $(IP)$(EPIC_LINK); then \
33 - $(MV) $(IP)$(EPIC_LINK) $(IP)$(EPIC_OLD); \
35 - $(RM) $(IP)$(EPIC_LINK); \
36 - ln -s $(IP)$(EPIC) $(IP)$(EPIC_LINK); \
38 + $(INSTALL_PROGRAM) source/epic $(DESTDIR)$(bindir)
45 installwserv: wserv installdirs test
46 - if ./my_test \( \! -f $(IP)$(WSERV) \) -o \
47 - source/wserv -nt $(IP)$(WSERV); then \
48 - $(INSTALL_PROGRAM) source/wserv $(IP)$(WSERV); \
51 + @srcdir@/mkinstalldirs $(DESTDIR)$(bindir)
52 + $(INSTALL_PROGRAM) source/wserv $(DESTDIR)$(bindir)
57 installscript: installdirs test
58 -chmod -x @srcdir@/script/*
60 - if ./my_test -f $(IP)$(scriptdir)/local; then \
61 + if ./my_test -f $(DESTDIR)$(scriptdir)/local; then \
62 if ./my_test -f script/local; then \
63 $(MV) @srcdir@/script/local \
64 @srcdir@/script/local.orig; \
67 for i in @srcdir@/script/*; \
69 - target=$(IP)$(scriptdir)/`basename $$i`; \
70 + target=$(DESTDIR)$(scriptdir)/`basename $$i`; \
71 if ./my_test -f $$target; then \
72 if ./my_test $$i -nt $$target; then \
73 $(INSTALL_DATA) $$i $$target; \
77 $(INSTALL_DATA) $$i $$target; \
78 - if ./my_test -f $(IP)$(scriptdir)/gzip-scripts; then \
79 + if ./my_test -f $(DESTDIR)$(scriptdir)/gzip-scripts; then \
85 helpdir = $(epicdir)/help
86 installhelp: installdirs
87 - (cd @srcdir@/help; tar cf - .) | (cd $(IP)$(helpdir); tar xf -)
88 + (cd @srcdir@/help; tar cf - .) | (cd $(DESTDIR)$(helpdir); tar xf -)
90 installman: installdirs
91 - $(INSTALL_DATA) @srcdir@/doc/epic.1 $(IP)/$(mandir)/man1/$(epic).1
92 + $(INSTALL_DATA) @srcdir@/doc/epic.1 $(DESTDIR)$(mandir)/man1/$(epic).1
96 - @srcdir@/mkinstalldirs $(IP)$(epicdir) $(IP)$(scriptdir) \
97 - $(IP)$(helpdir) $(IP)$(bindir) $(IP)$(libexecdir) \
99 + @srcdir@/mkinstalldirs $(DESTDIR)$(epicdir) $(DESTDIR)$(scriptdir) \
100 + $(DESTDIR)$(helpdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) \
101 + $(DESTDIR)$(mandir)/man1
103 test.o: @srcdir@/test.c
104 $(CC) -c @srcdir@/test.c
105 diff -Nru epic4-2000/bsdinstall epic4-2000.new/bsdinstall
106 --- epic4-2000/bsdinstall Fri May 10 21:47:38 1996
107 +++ epic4-2000.new/bsdinstall Mon Apr 17 20:25:42 2000
112 -# @(#)install.sh 4.5 (Berkeley) 10/12/83
113 +# install - install a program, script, or datafile
114 +# This comes from X11R5 (mit/util/scripts/install.sh).
118 -chmod="/bin/chmod 755"
123 - -s ) strip="/bin/strip"
126 - -c ) cmd="/bin/cp -p"
129 - -m ) chmod="/bin/chmod $2"
133 - -o ) chown="/etc/chown -f $2"
137 - -g ) chgrp="/bin/chgrp -f $2"
141 - -d ) cmd="/bin/mkdir"
147 +# Copyright 1991 by the Massachusetts Institute of Technology
149 +# Permission to use, copy, modify, distribute, and sell this software and its
150 +# documentation for any purpose is hereby granted without fee, provided that
151 +# the above copyright notice appear in all copies and that both that
152 +# copyright notice and this permission notice appear in supporting
153 +# documentation, and that the name of M.I.T. not be used in advertising or
154 +# publicity pertaining to distribution of the software without specific,
155 +# written prior permission. M.I.T. makes no representations about the
156 +# suitability of this software for any purpose. It is provided "as is"
157 +# without express or implied warranty.
159 +# Calling this script install-sh is preferred over install.sh, to prevent
160 +# `make' implicit rules from creating a file called install from it
161 +# when there is no Makefile.
163 +# This script is compatible with the BSD install script, but was written
164 +# from scratch. It can only install one file at a time, a restriction
165 +# shared with many OS's install programs.
168 +# set DOITPROG to echo to test this script
170 +# Don't use :- since 4.3BSD and earlier shells don't like it.
174 +# put in absolute paths if you don't have them in your path; or use env. vars.
176 +mvprog="${MVPROG-mv}"
177 +cpprog="${CPPROG-cp}"
178 +chmodprog="${CHMODPROG-chmod}"
179 +chownprog="${CHOWNPROG-chown}"
180 +chgrpprog="${CHGRPPROG-chgrp}"
181 +stripprog="${STRIPPROG-strip}"
182 +rmprog="${RMPROG-rm}"
183 +mkdirprog="${MKDIRPROG-mkdir}"
185 +transformbasename=""
188 +chmodcmd="$chmodprog 0755"
198 +while [ x"$1" != x ]; do
200 + -c) instcmd="$cpprog"
208 + -m) chmodcmd="$chmodprog $2"
213 + -o) chowncmd="$chownprog $2"
218 + -g) chgrpcmd="$chgrpprog $2"
223 + -s) stripcmd="$stripprog"
227 + -t=*) transformarg=`echo $1 | sed 's/-t=//'`
231 + -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
235 + *) if [ x"$src" = x ]
239 + # this colon is to work around a 386BSD /bin/sh bug
248 -if test ! ${2-""}; then
249 - echo "install: no destination specified"
252 + echo "install: no input file specified"
257 -if test ${3-""}; then
258 - echo "install: too many files specified -> $*"
261 -if test $1 = $2 -o $2 = .; then
262 - echo "install: can't move $1 onto itself"
270 - if test '!' -f $1; then
271 - echo "install: can't open $1"
274 +if [ x"$dir_arg" != x ]; then
278 + if [ -d $dst ]; then
284 - if test -d $2; then
288 +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
289 +# might cause directories to be created, which would be especially bad
290 +# if $src (and thus $dsttmp) contains '*'.
292 + if [ -f $src -o -d $src ]
297 + echo "install: $src does not exist"
306 - if test ! -d "$file"; then
312 - if test -n "$strip"; then
317 + echo "install: no destination specified"
325 -if test -n "$chown"; then
327 +# If destination is a directory, append the input filename; if your system
328 +# does not like double slashes in filenames, you may need to add some logic
332 + dst="$dst"/`basename $src`
337 -if test -n "$chgrp"; then
340 +## this sed command emulates the dirname command
341 +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
343 +# Make sure that the destination directory exists.
344 +# this part is taken from Noah Friedman's mkinstalldirs script
346 +# Skip lots of stat calls in the usual case.
347 +if [ ! -d "$dstdir" ]; then
350 +IFS="${IFS-${defaultIFS}}"
353 +# Some sh's can't handle IFS=/ for some reason.
355 +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
360 +while [ $# -ne 0 ] ; do
361 + pathcomp="${pathcomp}${1}"
364 + if [ ! -d "${pathcomp}" ] ;
366 + $mkdirprog "${pathcomp}"
371 + pathcomp="${pathcomp}/"
376 +if [ x"$dir_arg" != x ]
378 + $doit $instcmd $dst &&
380 + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
381 + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
382 + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
383 + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
386 +# If we're going to rename the final executable, determine the name now.
388 + if [ x"$transformarg" = x ]
390 + dstfile=`basename $dst`
392 + dstfile=`basename $dst $transformbasename |
393 + sed $transformarg`$transformbasename
396 +# don't allow the sed command to completely eliminate the filename
398 + if [ x"$dstfile" = x ]
400 + dstfile=`basename $dst`
405 +# Make a temp file name in the proper directory.
407 + dsttmp=$dstdir/#inst.$$#
409 +# Move or copy the file name to the temp name
411 + $doit $instcmd $src $dsttmp &&
413 + trap "rm -f ${dsttmp}" 0 &&
415 +# and set any options; do chmod last to preserve setuid bits
417 +# If any of these fail, we abort the whole thing. If we want to
418 +# ignore errors from any of these, just make sure not to ignore
419 +# errors from the above "$doit $instcmd $src $dsttmp" command.
421 + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
422 + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
423 + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
424 + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
426 +# Now rename the file to the real destination.
428 + $doit $rmcmd -f $dstdir/$dstfile &&
429 + $doit $mvcmd $dsttmp $dstdir/$dstfile