Ticket #6698: patch-Makefile.diff

File patch-Makefile.diff, 2.6 KB (added by blair (Blair Zajac), 19 years ago)

New patch-Makefile.diff

  • Makefile

    old new  
    2121# If they don't exist, this makefile will try to create the directories
    2222# LIBDIR and SHAREDIR.  All others must already exist.
    2323
    24 JOVEHOME = /usr/local
    25 SHAREDIR = $(JOVEHOME)/lib/jove
    26 LIBDIR = $(JOVEHOME)/lib/jove
     24JOVEHOME = __PREFIX
     25SHAREDIR = $(JOVEHOME)/share/jove
     26LIBDIR = $(JOVEHOME)/libexec/jove
    2727BINDIR = $(JOVEHOME)/bin
    2828XEXT=
    29 MANDIR = $(JOVEHOME)/man/man$(MANEXT)
     29MANDIR = $(JOVEHOME)/share/man/man$(MANEXT)
    3030MANEXT = 1
    3131
    3232# TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
     
    3838# (in case the system startup salvages tempfiles by moving them,
    3939# which is probably a good idea).
    4040
    41 TMPDIR = /tmp
     41TMPDIR = /var/tmp
    4242RECDIR = /var/preserve
    4343
    4444# DFLTSHELL is the default shell invoked by JOVE and TEACHJOVE.
    45 DFLTSHELL = /bin/csh
     45DFLTSHELL = /bin/sh
    4646
    4747# The install commands of BSD and System V differ in unpleasant ways:
    4848# -c: copy (BSD); -c dir: destination directory (SysV)
     
    5353# "cp" will work reasonably well, but be aware that any links continue
    5454# referencing the old file with new contents.
    5555
     56INSTALL=/usr/bin/install
    5657INSTALLFLAGS = # -g bin -o root
    5758
    5859# to install executable files
    59 XINSTALL=cp
     60#XINSTALL=cp
    6061#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
    6162#CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
     63XINSTALL=$(INSTALL) $(INSTALLFLAGS) -c -m 755
    6264
    6365# to install text files
    64 TINSTALL=cp
     66#TINSTALL=cp
    6567#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
    6668#CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
     69TINSTALL=$(INSTALL) $(INSTALLFLAGS) -c -m 644
    6770
    6871# These should all just be right if the above ones are.
    6972# You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
     
    7376RECOVER = $(LIBDIR)/recover$(XEXT)
    7477PORTSRV = $(LIBDIR)/portsrv$(XEXT)
    7578JOVERC = $(SHAREDIR)/jove.rc
     79JOVELOCALRC = $(SHAREDIR)/jove-local.rc
    7680TERMSDIR = $(SHAREDIR)
    7781CMDS.DOC = $(SHAREDIR)/cmds.doc
    7882TEACH-JOVE = $(SHAREDIR)/teach-jove
     
    146150# On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
    147151# and perhaps -g3 for more debugging info with optimization.
    148152
    149 OPTFLAGS = -O
     153OPTFLAGS = -Os
    150154
    151155# For making dependencies under BSD systems
    152156DEPENDFLAG = -M
     
    361365         $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
    362366         $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
    363367        $(TINSTALL) doc/jove.rc $(JOVERC)
     368        $(TINSTALL) doc/jove-local.rc $(JOVELOCALRC)
    364369        @echo See the README about changes to /etc/rc or /etc/rc.local
    365370        @echo so that the system recovers jove files on reboot after a crash
    366371