1 diff -urN epic4-1.1.6.orig/Makefile.in epic4-1.1.6/Makefile.in
2 --- epic4-1.1.6.orig/Makefile.in Fri Sep 13 16:16:56 2002
3 +++ epic4-1.1.6/Makefile.in Fri Sep 13 16:23:30 2002
8 -epic_exe = $(bindir)/$(epic)
9 -wserv_exe = $(libexecdir)/wserv4
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); \
39 + $(INSTALL_PROGRAM) source/epic $(DESTDIR)$(bindir)
47 installwserv: wserv4 installdirs test
48 - if ./my_test \( \! -f $(IP)$(WSERV) \) -o \
49 - source/wserv4 -nt $(IP)$(WSERV); then \
50 - $(INSTALL_PROGRAM) source/wserv4 $(IP)$(WSERV); \
54 + @srcdir@/mkinstalldirs $(DESTDIR)$(bindir)
55 + $(INSTALL_PROGRAM) source/wserv4 $(DESTDIR)$(bindir)
60 scriptdir = $(epicdir)/script
61 installscript: installdirs test
63 - if ./my_test -f $(IP)$(scriptdir)/local; then \
64 + if ./my_test -f $(DESTDIR)$(scriptdir)/local; then \
65 if ./my_test -f script/local; then \
66 $(MV) @srcdir@/script/local \
67 @srcdir@/script/local.orig; \
69 if ./my_test -x $$i; then \
72 - target=$(IP)$(scriptdir)/`basename $$i`; \
73 + target=$(DESTDIR)$(scriptdir)/`basename $$i`; \
74 if ./my_test -f $$target; then \
75 if ./my_test $$i -nt $$target; then \
76 $(INSTALL_DATA) $$i $$target; \
80 $(INSTALL_DATA) $$i $$target; \
81 - if ./my_test -f $(IP)$(scriptdir)/gzip-scripts; then \
82 + if ./my_test -f $(DESTDIR)$(scriptdir)/gzip-scripts; then \
88 helpdir = $(epicdir)/help
89 installhelp: installdirs
90 - (cd @srcdir@/help; tar cf - .) | (cd $(IP)$(helpdir); tar xf -)
91 + (cd @srcdir@/help; tar cf - .) | (cd $(DESTDIR)$(helpdir); tar xf -)
93 installman: installdirs
94 - $(INSTALL_DATA) @srcdir@/doc/epic.1 $(IP)/$(mandir)/man1/$(epic).1
95 + $(INSTALL_DATA) @srcdir@/doc/epic.1 $(DESTDIR)/$(mandir)/man1/$(epic).1
99 - @srcdir@/mkinstalldirs $(IP)$(epicdir) $(IP)$(scriptdir) \
100 - $(IP)$(helpdir) $(IP)$(bindir) $(IP)$(libexecdir) \
101 - $(IP)$(mandir)/man1
102 + @srcdir@/mkinstalldirs $(DESTDIR)$(epicdir) $(DESTDIR)$(scriptdir) \
103 + $(DESTDIR)$(helpdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) \
104 + $(DESTDIR)$(mandir)/man1
106 test.o: @srcdir@/test.c
107 $(CC) -c @srcdir@/test.c
108 diff -urN epic4-0.9.15.org/bsdinstall epic4-0.9.15/bsdinstall
109 --- epic4-0.9.15.org/bsdinstall Sun Jan 7 11:39:32 2001
110 +++ epic4-0.9.15/bsdinstall Sun Jan 7 11:39:41 2001
115 -# @(#)install.sh 4.5 (Berkeley) 10/12/83
116 +# install - install a program, script, or datafile
117 +# This comes from X11R5 (mit/util/scripts/install.sh).
121 -chmod="/bin/chmod 755"
126 - -s ) strip="/bin/strip"
129 - -c ) cmd="/bin/cp -p"
132 - -m ) chmod="/bin/chmod $2"
136 - -o ) chown="/etc/chown -f $2"
140 - -g ) chgrp="/bin/chgrp -f $2"
144 - -d ) cmd="/bin/mkdir"
150 +# Copyright 1991 by the Massachusetts Institute of Technology
152 +# Permission to use, copy, modify, distribute, and sell this software and its
153 +# documentation for any purpose is hereby granted without fee, provided that
154 +# the above copyright notice appear in all copies and that both that
155 +# copyright notice and this permission notice appear in supporting
156 +# documentation, and that the name of M.I.T. not be used in advertising or
157 +# publicity pertaining to distribution of the software without specific,
158 +# written prior permission. M.I.T. makes no representations about the
159 +# suitability of this software for any purpose. It is provided "as is"
160 +# without express or implied warranty.
162 +# Calling this script install-sh is preferred over install.sh, to prevent
163 +# `make' implicit rules from creating a file called install from it
164 +# when there is no Makefile.
166 +# This script is compatible with the BSD install script, but was written
167 +# from scratch. It can only install one file at a time, a restriction
168 +# shared with many OS's install programs.
171 +# set DOITPROG to echo to test this script
173 +# Don't use :- since 4.3BSD and earlier shells don't like it.
177 +# put in absolute paths if you don't have them in your path; or use env. vars.
179 +mvprog="${MVPROG-mv}"
180 +cpprog="${CPPROG-cp}"
181 +chmodprog="${CHMODPROG-chmod}"
182 +chownprog="${CHOWNPROG-chown}"
183 +chgrpprog="${CHGRPPROG-chgrp}"
184 +stripprog="${STRIPPROG-strip}"
185 +rmprog="${RMPROG-rm}"
186 +mkdirprog="${MKDIRPROG-mkdir}"
188 +transformbasename=""
191 +chmodcmd="$chmodprog 0755"
201 +while [ x"$1" != x ]; do
203 + -c) instcmd="$cpprog"
211 + -m) chmodcmd="$chmodprog $2"
216 + -o) chowncmd="$chownprog $2"
221 + -g) chgrpcmd="$chgrpprog $2"
226 + -s) stripcmd="$stripprog"
230 + -t=*) transformarg=`echo $1 | sed 's/-t=//'`
234 + -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
238 + *) if [ x"$src" = x ]
242 + # this colon is to work around a 386BSD /bin/sh bug
251 -if test ! ${2-""}; then
252 - echo "install: no destination specified"
255 + echo "install: no input file specified"
260 -if test ${3-""}; then
261 - echo "install: too many files specified -> $*"
264 -if test $1 = $2 -o $2 = .; then
265 - echo "install: can't move $1 onto itself"
273 - if test '!' -f $1; then
274 - echo "install: can't open $1"
277 +if [ x"$dir_arg" != x ]; then
281 + if [ -d $dst ]; then
287 - if test -d $2; then
291 +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
292 +# might cause directories to be created, which would be especially bad
293 +# if $src (and thus $dsttmp) contains '*'.
295 + if [ -f $src -o -d $src ]
300 + echo "install: $src does not exist"
309 - if test ! -d "$file"; then
315 - if test -n "$strip"; then
320 + echo "install: no destination specified"
328 -if test -n "$chown"; then
330 +# If destination is a directory, append the input filename; if your system
331 +# does not like double slashes in filenames, you may need to add some logic
335 + dst="$dst"/`basename $src`
340 -if test -n "$chgrp"; then
343 +## this sed command emulates the dirname command
344 +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
346 +# Make sure that the destination directory exists.
347 +# this part is taken from Noah Friedman's mkinstalldirs script
349 +# Skip lots of stat calls in the usual case.
350 +if [ ! -d "$dstdir" ]; then
353 +IFS="${IFS-${defaultIFS}}"
356 +# Some sh's can't handle IFS=/ for some reason.
358 +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
363 +while [ $# -ne 0 ] ; do
364 + pathcomp="${pathcomp}${1}"
367 + if [ ! -d "${pathcomp}" ] ;
369 + $mkdirprog "${pathcomp}"
374 + pathcomp="${pathcomp}/"
379 +if [ x"$dir_arg" != x ]
381 + $doit $instcmd $dst &&
383 + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
384 + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
385 + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
386 + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
389 +# If we're going to rename the final executable, determine the name now.
391 + if [ x"$transformarg" = x ]
393 + dstfile=`basename $dst`
395 + dstfile=`basename $dst $transformbasename |
396 + sed $transformarg`$transformbasename
399 +# don't allow the sed command to completely eliminate the filename
401 + if [ x"$dstfile" = x ]
403 + dstfile=`basename $dst`
408 +# Make a temp file name in the proper directory.
410 + dsttmp=$dstdir/#inst.$$#
412 +# Move or copy the file name to the temp name
414 + $doit $instcmd $src $dsttmp &&
416 + trap "rm -f ${dsttmp}" 0 &&
418 +# and set any options; do chmod last to preserve setuid bits
420 +# If any of these fail, we abort the whole thing. If we want to
421 +# ignore errors from any of these, just make sure not to ignore
422 +# errors from the above "$doit $instcmd $src $dsttmp" command.
424 + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
425 + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
426 + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
427 + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
429 +# Now rename the file to the real destination.
431 + $doit $rmcmd -f $dstdir/$dstfile &&
432 + $doit $mvcmd $dsttmp $dstdir/$dstfile