Ticket #6698: patch-Makefile.diff

Makefile

@@ -21 +21 @@
 # If they don't exist, this makefile will try to create the directories
 # LIBDIR and SHAREDIR.  All others must already exist.
 
-JOVEHOME = /usr/local
-SHAREDIR = $(JOVEHOME)/lib/jove
-LIBDIR = $(JOVEHOME)/lib/jove
+JOVEHOME = __PREFIX
+SHAREDIR = $(JOVEHOME)/share/jove
+LIBDIR = $(JOVEHOME)/libexec/jove
 BINDIR = $(JOVEHOME)/bin
 XEXT=
-MANDIR = $(JOVEHOME)/man/man$(MANEXT)
+MANDIR = $(JOVEHOME)/share/man/man$(MANEXT)
 MANEXT = 1
 
 # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
@@ -38 +38 @@
 # (in case the system startup salvages tempfiles by moving them,
 # which is probably a good idea).
 
-TMPDIR = /tmp
+TMPDIR = /var/tmp
 RECDIR = /var/preserve
 
 # DFLTSHELL is the default shell invoked by JOVE and TEACHJOVE.
-DFLTSHELL = /bin/csh
+DFLTSHELL = /bin/sh
 
 # The install commands of BSD and System V differ in unpleasant ways:
 # -c: copy (BSD); -c dir: destination directory (SysV)
@@ -53 +53 @@
 # "cp" will work reasonably well, but be aware that any links continue
 # referencing the old file with new contents.
 
+INSTALL=/usr/bin/install
 INSTALLFLAGS = # -g bin -o root
 
 # to install executable files
-XINSTALL=cp
+#XINSTALL=cp
 #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
 #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
+XINSTALL=$(INSTALL) $(INSTALLFLAGS) -c -m 755
 
 # to install text files
-TINSTALL=cp
+#TINSTALL=cp
 #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
 #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
+TINSTALL=$(INSTALL) $(INSTALLFLAGS) -c -m 644
 
 # These should all just be right if the above ones are.
 # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
@@ -73 +76 @@
 RECOVER = $(LIBDIR)/recover$(XEXT)
 PORTSRV = $(LIBDIR)/portsrv$(XEXT)
 JOVERC = $(SHAREDIR)/jove.rc
+JOVELOCALRC = $(SHAREDIR)/jove-local.rc
 TERMSDIR = $(SHAREDIR)
 CMDS.DOC = $(SHAREDIR)/cmds.doc
 TEACH-JOVE = $(SHAREDIR)/teach-jove
@@ -146 +150 @@
 # On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
 # and perhaps -g3 for more debugging info with optimization.
 
-OPTFLAGS = -O
+OPTFLAGS = -Os
 
 # For making dependencies under BSD systems
 DEPENDFLAG = -M
@@ -361 +365 @@
          $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
          $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
         $(TINSTALL) doc/jove.rc $(JOVERC)
+        $(TINSTALL) doc/jove-local.rc $(JOVELOCALRC)
         @echo See the README about changes to /etc/rc or /etc/rc.local
         @echo so that the system recovers jove files on reboot after a crash