epic4-1.1.6.DESTDIR.patch

   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
   4 @@ -72,9 +72,9 @@
   5  mandir     = @mandir@
   6
   7  epic        = @epic@
   8 -epic_exe    = $(bindir)/$(epic)
   9 -wserv_exe   = $(libexecdir)/wserv4
  10 -epicdir     = $(sharedir)/$(epic)
  11 +epic_exe    = $(epic)
  12 +wserv_exe   = wserv4
  13 +epicdir     = $(epic)
  14
  15  ############ You ought not change anything below this line ###################
  16
  17 @@ -111,23 +111,12 @@
  18  epic: source/Makefile Makefile
  19         @cd source; $(MAKE2) all
  20
  21 -EPIC     = $(epic_exe)-$(VERSION)
  22 +EPIC     = $(epic_exe)
  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); \
  31 -               fi; \
  32 -               if ./my_test -f $(IP)$(EPIC_LINK); then \
  33 -                       $(MV) $(IP)$(EPIC_LINK) $(IP)$(EPIC_OLD); \
  34 -               fi; \
  35 -               $(RM) $(IP)$(EPIC_LINK); \
  36 -               ln -s $(IP)$(EPIC) $(IP)$(EPIC_LINK); \
  37 -       fi
  38 -
  39 +       $(INSTALL_PROGRAM) source/epic $(DESTDIR)$(bindir)
  40 +
  41  #
  42  # wserv
  43  #
  44 @@ -136,19 +125,16 @@
  45
  46  WSERV   = $(wserv_exe)
  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); \
  51 -       fi
  52 -
  53 -
  54 +       @srcdir@/mkinstalldirs $(DESTDIR)$(bindir)
  55 +       $(INSTALL_PROGRAM) source/wserv4 $(DESTDIR)$(bindir)
  56 +
  57  #
  58  # Script library
  59  #
  60  scriptdir = $(epicdir)/script
  61  installscript: installdirs test
  62         -@(                                                             \
  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;     \
  68 @@ -161,7 +147,7 @@
  69                         if ./my_test -x $$i; then \
  70                                 chmod a-x $$i; \
  71                         fi; \
  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; \
  77 @@ -173,7 +159,7 @@
  78                                 fi; \
  79                         else \
  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 \
  83                                         gzip -f $$target; \
  84                                 fi; \
  85                         fi; \
  86 @@ -182,16 +168,16 @@
  87
  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 -)
  92
  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
  96
  97  installdirs:
  98         umask 022; \
  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
 105
 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
 111 @@ -1,90 +1,251 @@
 112 -#! /bin/sh
 113 +#!/bin/sh
 114  #
 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).
 118  #
 119 -cmd=/bin/mv
 120 -strip=""
 121 -chmod="/bin/chmod 755"
 122 -chown=""
 123 -chgrp=""
 124 -while true ; do
 125 -       case $1 in
 126 -               -s )    strip="/bin/strip"
 127 -                       shift
 128 -                       ;;
 129 -               -c )    cmd="/bin/cp -p"
 130 -                       shift
 131 -                       ;;
 132 -               -m )    chmod="/bin/chmod $2"
 133 -                       shift
 134 -                       shift
 135 -                       ;;
 136 -               -o )    chown="/etc/chown -f $2"
 137 -                       shift
 138 -                       shift
 139 -                       ;;
 140 -               -g )    chgrp="/bin/chgrp -f $2"
 141 -                       shift
 142 -                       shift
 143 -                       ;;
 144 -               -d )    cmd="/bin/mkdir"
 145 -                       shift
 146 -                       ;;
 147 -               * )     break
 148 -                       ;;
 149 -       esac
 150 +# Copyright 1991 by the Massachusetts Institute of Technology
 151 +#
 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.
 161 +#
 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.
 165 +#
 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.
 169 +
 170 +
 171 +# set DOITPROG to echo to test this script
 172 +
 173 +# Don't use :- since 4.3BSD and earlier shells don't like it.
 174 +doit="${DOITPROG-}"
 175 +
 176 +
 177 +# put in absolute paths if you don't have them in your path; or use env. vars.
 178 +
 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}"
 187 +
 188 +transformbasename=""
 189 +transform_arg=""
 190 +instcmd="$mvprog"
 191 +chmodcmd="$chmodprog 0755"
 192 +chowncmd=""
 193 +chgrpcmd=""
 194 +stripcmd=""
 195 +rmcmd="$rmprog -f"
 196 +mvcmd="$mvprog"
 197 +src=""
 198 +dst=""
 199 +dir_arg=""
 200 +
 201 +while [ x"$1" != x ]; do
 202 +    case $1 in
 203 +       -c) instcmd="$cpprog"
 204 +           shift
 205 +           continue;;
 206 +
 207 +       -d) dir_arg=true
 208 +           shift
 209 +           continue;;
 210 +
 211 +       -m) chmodcmd="$chmodprog $2"
 212 +           shift
 213 +           shift
 214 +           continue;;
 215 +
 216 +       -o) chowncmd="$chownprog $2"
 217 +           shift
 218 +           shift
 219 +           continue;;
 220 +
 221 +       -g) chgrpcmd="$chgrpprog $2"
 222 +           shift
 223 +           shift
 224 +           continue;;
 225 +
 226 +       -s) stripcmd="$stripprog"
 227 +           shift
 228 +           continue;;
 229 +
 230 +       -t=*) transformarg=`echo $1 | sed 's/-t=//'`
 231 +           shift
 232 +           continue;;
 233 +
 234 +       -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
 235 +           shift
 236 +           continue;;
 237 +
 238 +       *)  if [ x"$src" = x ]
 239 +           then
 240 +               src=$1
 241 +           else
 242 +               # this colon is to work around a 386BSD /bin/sh bug
 243 +               :
 244 +               dst=$1
 245 +           fi
 246 +           shift
 247 +           continue;;
 248 +    esac
 249  done
 250
 251 -if test ! ${2-""}; then
 252 -       echo "install: no destination specified"
 253 +if [ x"$src" = x ]
 254 +then
 255 +       echo "install:  no input file specified"
 256         exit 1
 257 +else
 258 +       true
 259  fi
 260 -if test ${3-""}; then
 261 -       echo "install: too many files specified -> $*"
 262 -       exit 1
 263 -fi
 264 -if test $1 = $2 -o $2 = .; then
 265 -       echo "install: can't move $1 onto itself"
 266 -       exit 1
 267 -fi
 268 -case $cmd in
 269 -/bin/mkdir )
 270 -       file=$2/$1
 271 -       ;;
 272 -* )
 273 -       if test '!' -f $1; then
 274 -               echo "install: can't open $1"
 275 -               exit 1
 276 +
 277 +if [ x"$dir_arg" != x ]; then
 278 +       dst=$src
 279 +       src=""
 280 +
 281 +       if [ -d $dst ]; then
 282 +               instcmd=:
 283 +               chmodcmd=""
 284 +       else
 285 +               instcmd=mkdir
 286         fi
 287 -       if test -d $2; then
 288 -               file=$2/$1
 289 +else
 290 +
 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 '*'.
 294 +
 295 +       if [ -f $src -o -d $src ]
 296 +       then
 297 +               true
 298         else
 299 -               file=$2
 300 +               echo "install:  $src does not exist"
 301 +               exit 1
 302         fi
 303 -       /bin/rm -f $file
 304 -       ;;
 305 -esac
 306 -
 307 -case $cmd in
 308 -/bin/mkdir )
 309 -       if test ! -d "$file"; then
 310 -               $cmd $file
 311 -       fi
 312 -       ;;
 313 -* )
 314 -       $cmd $1 $file
 315 -       if test -n "$strip"; then
 316 -               $strip $file
 317 +
 318 +       if [ x"$dst" = x ]
 319 +       then
 320 +               echo "install:  no destination specified"
 321 +               exit 1
 322 +       else
 323 +               true
 324         fi
 325 -       ;;
 326 -esac
 327
 328 -if test -n "$chown"; then
 329 -       $chown $file
 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
 332 +
 333 +       if [ -d $dst ]
 334 +       then
 335 +               dst="$dst"/`basename $src`
 336 +       else
 337 +               true
 338 +       fi
 339  fi
 340 -if test -n "$chgrp"; then
 341 -       $chgrp $file
 342 +
 343 +## this sed command emulates the dirname command
 344 +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 345 +
 346 +# Make sure that the destination directory exists.
 347 +#  this part is taken from Noah Friedman's mkinstalldirs script
 348 +
 349 +# Skip lots of stat calls in the usual case.
 350 +if [ ! -d "$dstdir" ]; then
 351 +defaultIFS='
 352 +'
 353 +IFS="${IFS-${defaultIFS}}"
 354 +
 355 +oIFS="${IFS}"
 356 +# Some sh's can't handle IFS=/ for some reason.
 357 +IFS='%'
 358 +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
 359 +IFS="${oIFS}"
 360 +
 361 +pathcomp=''
 362 +
 363 +while [ $# -ne 0 ] ; do
 364 +       pathcomp="${pathcomp}${1}"
 365 +       shift
 366 +
 367 +       if [ ! -d "${pathcomp}" ] ;
 368 +        then
 369 +               $mkdirprog "${pathcomp}"
 370 +       else
 371 +               true
 372 +       fi
 373 +
 374 +       pathcomp="${pathcomp}/"
 375 +done
 376  fi
 377 -$chmod $file
 378 +
 379 +if [ x"$dir_arg" != x ]
 380 +then
 381 +       $doit $instcmd $dst &&
 382 +
 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
 387 +else
 388 +
 389 +# If we're going to rename the final executable, determine the name now.
 390 +
 391 +       if [ x"$transformarg" = x ]
 392 +       then
 393 +               dstfile=`basename $dst`
 394 +       else
 395 +               dstfile=`basename $dst $transformbasename |
 396 +                       sed $transformarg`$transformbasename
 397 +       fi
 398 +
 399 +# don't allow the sed command to completely eliminate the filename
 400 +
 401 +       if [ x"$dstfile" = x ]
 402 +       then
 403 +               dstfile=`basename $dst`
 404 +       else
 405 +               true
 406 +       fi
 407 +
 408 +# Make a temp file name in the proper directory.
 409 +
 410 +       dsttmp=$dstdir/#inst.$$#
 411 +
 412 +# Move or copy the file name to the temp name
 413 +
 414 +       $doit $instcmd $src $dsttmp &&
 415 +
 416 +       trap "rm -f ${dsttmp}" 0 &&
 417 +
 418 +# and set any options; do chmod last to preserve setuid bits
 419 +
 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.
 423 +
 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 &&
 428 +
 429 +# Now rename the file to the real destination.
 430 +
 431 +       $doit $rmcmd -f $dstdir/$dstfile &&
 432 +       $doit $mvcmd $dsttmp $dstdir/$dstfile
 433 +
 434 +fi &&
 435 +
 436
 437  exit 0