patch-Makefile 3.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293
  1. $OpenBSD: patch-Makefile,v 1.3 2011/11/11 20:08:40 jasper Exp $
  2. --- Makefile.orig Wed May 26 06:46:38 2010
  3. +++ Makefile Fri Nov 11 20:59:04 2011
  4. @@ -21,9 +21,9 @@ SHELL = /bin/sh
  5. # If they don't exist, this makefile will try to create the directories
  6. # LIBDIR and SHAREDIR. All others must already exist.
  7. -JOVEHOME = /usr/local
  8. -SHAREDIR = $(JOVEHOME)/lib/jove
  9. -LIBDIR = $(JOVEHOME)/lib/jove
  10. +JOVEHOME = ${PREFIX}
  11. +SHAREDIR = $(JOVEHOME)/share/jove
  12. +LIBDIR = $(JOVEHOME)/libexec/jove
  13. BINDIR = $(JOVEHOME)/bin
  14. XEXT=
  15. MANDIR = $(JOVEHOME)/man/man$(MANEXT)
  16. @@ -56,14 +56,16 @@ DFLTSHELL = /bin/csh
  17. INSTALLFLAGS = # -g bin -o root
  18. # to install executable files
  19. -XINSTALL=cp
  20. +#XINSTALL=cp
  21. #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
  22. #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
  23. +XINSTALL=${BSD_INSTALL_PROGRAM}
  24. # to install text files
  25. -TINSTALL=cp
  26. +#TINSTALL=cp
  27. #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
  28. #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
  29. +TINSTALL=${BSD_INSTALL_DATA}
  30. # These should all just be right if the above ones are.
  31. # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
  32. @@ -138,6 +140,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
  33. # to exit using exit(), instead of _exit()).
  34. SYSDEFS = -DBSDPOSIX_STDC
  35. +#SYSDEFS = -DBSDPOSIX
  36. # Select optimization level (flags passed to compiling and linking steps).
  37. # On most systems: -g for debugging, -O for optimization.
  38. @@ -146,7 +149,7 @@ SYSDEFS = -DBSDPOSIX_STDC
  39. # On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
  40. # and perhaps -g3 for more debugging info with optimization.
  41. -OPTFLAGS = -O
  42. +#OPTFLAGS = -O
  43. # For making dependencies under BSD systems
  44. DEPENDFLAG = -M
  45. @@ -181,13 +184,13 @@ EXTRALIBS =
  46. # PDP-11 with separate I&D: -i
  47. # PDP-11 without separate I&D: -n
  48. -LDFLAGS =
  49. +#LDFLAGS =
  50. # for SCO Xenix, set
  51. # MEMFLAGS = -Mle
  52. # CFLAGS = -LARGE -O -F 3000 -K -Mle (say -Mle2 for an 80286)
  53. -CFLAGS = $(OPTFLAGS) $(SYSDEFS)
  54. +CFLAGS += $(SYSDEFS)
  55. # For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
  56. # CC = /usr/bin/cc
  57. @@ -236,7 +239,7 @@ NROFF = nroff
  58. TROFF = troff -Tpost
  59. TROFFPOST = | /usr/lib/lp/postscript/dpost -
  60. -MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
  61. +MANUALS = $(JOVEM) $(TEACHJOVEM) # $(XJOVEM) $(JOVETOOLM)
  62. C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
  63. delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \
  64. @@ -362,8 +365,12 @@ install: $(LIBDIR) $(SHAREDIR) \
  65. $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
  66. $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
  67. $(TINSTALL) doc/jove.rc $(JOVERC)
  68. - @echo See the README about changes to /etc/rc or /etc/rc.local
  69. - @echo so that the system recovers jove files on reboot after a crash
  70. + $(TINSTALL) README $(SHAREDIR)
  71. + @echo ""
  72. + @echo "*** See $(SHAREDIR)/README about changes to /etc/rc or"
  73. + @echo "*** /etc/rc.local so that the system recovers jove files"
  74. + @echo "*** on reboot after a system crash"
  75. + @echo ""
  76. $(LIBDIR)::
  77. test -d $(LIBDIR) || mkdir -p $(LIBDIR)