Fix merge conflicts

[bsdgames-darwin.git] / hack / Makefile

diff --git a/hack/Makefile b/hack/Makefile
index a84500b2963f934fa8e28fd41c31438872142acc..c4aed9cbaf788c5a7021b6599db789b00219a970 100644 (file)
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -1,11 +1,7 @@
-#      $NetBSD: Makefile,v 1.40 2006/02/25 11:56:51 simonb Exp $
+#      $NetBSD: Makefile,v 1.47 2020/02/08 00:59:55 fox Exp $

 #      @(#)Makefile    8.2 (Berkeley) 4/27/95
 
 #      @(#)Makefile    8.2 (Berkeley) 4/27/95
 

-.include <bsd.own.mk>
-

 PROG=  hack
 PROG=  hack

-CPPFLAGS+=-I.
-DPSRCS+=hack.onames.h hack.h

 SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
        hack.do.c hack.do_name.c hack.do_wear.c hack.dog.c hack.eat.c \
        hack.end.c hack.engrave.c hack.fight.c hack.invent.c hack.ioctl.c \
 SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
        hack.do.c hack.do_name.c hack.do_wear.c hack.dog.c hack.eat.c \
        hack.end.c hack.engrave.c hack.fight.c hack.invent.c hack.ioctl.c \


@@ -13,42 +9,37 @@ SRCS+=       alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
        hack.mkmaze.c hack.mkobj.c hack.mkshop.c hack.mon.c hack.monst.c \
        hack.o_init.c hack.objnam.c hack.options.c hack.pager.c hack.potion.c \
        hack.pri.c hack.read.c hack.rip.c hack.rumors.c hack.save.c \
        hack.mkmaze.c hack.mkobj.c hack.mkshop.c hack.mon.c hack.monst.c \
        hack.o_init.c hack.objnam.c hack.options.c hack.pager.c hack.potion.c \
        hack.pri.c hack.read.c hack.rip.c hack.rumors.c hack.save.c \

-       hack.search.c hack.shk.c hack.shknam.c hack.steal.c hack.termcap.c \
+       hack.search.c hack.shk.c hack.shknam.c hack.steal.c hack.terminfo.c \

        hack.timeout.c hack.topl.c hack.track.c hack.trap.c hack.tty.c \
        hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
        hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
 MAN=   hack.6
        hack.timeout.c hack.topl.c hack.track.c hack.trap.c hack.tty.c \
        hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
        hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
 MAN=   hack.6

-DPADD+=        ${LIBTERMCAP}
-LDADD+=        -ltermcap
-HIDEGAME=hidegame
-SETGIDGAME=yes
-CLEANFILES+=makedefs makedefs.lo
+CLEANFILES+=makedefs

 FILES=help hh data
 FILES=help hh data

-FILESDIR=/var/games/hackdir
-
+FILESDIR=$(LOCALSTATEDIR)/games/hackdir

 CLEANFILES+=hack.onames.h
 CLEANFILES+=hack.onames.h

+
+all: $(PROG)
+

 hack.onames.h: makedefs def.objects.h
 hack.onames.h: makedefs def.objects.h

-       ${_MKTARGET_CREATE}
-       ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h
+       ./makedefs def.objects.h > hack.onames.h

 
 

-makedefs: makedefs.lo
-       ${_MKTARGET_LINK}
-       ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC}
+makedefs: makedefs.c
+       clang -o makedefs makedefs.c

 
 hack.h:        hack.onames.h
 
 
 hack.h:        hack.onames.h
 

-.if !exists(${DESTDIR}${FILESDIR}/perm)
-afterinstall: clobber
-.endif
-
-clobber: 
-       ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/perm
-       ${INSTALL_FILE} -o games -g games -m 660 /dev/null \
-           ${DESTDIR}/var/games/hackdir/perm
-       ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/record
-       ${INSTALL_FILE} -o games -g games -m 660 /dev/null \
-           ${DESTDIR}/var/games/hackdir/record
-       ${_MKMSG_REMOVE} "${DESTDIR}/var/games/hackdir/bones*"
-       rm -f ${DESTDIR}/var/games/hackdir/bones*
-
-.include <bsd.prog.mk>
+$(PROG): $(SRCS) hack.h
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
+       $(STRIP) $(PROG)
+
+install: $(PROG) $(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       mkdir -p $(DESTDIR)$(FILESDIR)
+       $(GINSTALL) -Dm660 $(FILES) $(DESTDIR)$(FILESDIR)
+
+clean:
+       rm -f $(CLEANFILES) $(PROG)
+
+.PHONY: all clean install