Fix build on -current (catch up to <bsd.prog.mk> changes)

This commit is contained in:
Kris Kennaway 2002-09-08 10:46:25 +00:00
parent e803575462
commit b8d312f395
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65837

View file

@ -1,32 +1,24 @@
diff -cdNr ../xroach.BSD/Makefile ./Makefile
*** ../xroach.BSD/Makefile Wed Jun 9 04:12:04 1993
--- ./Makefile Fri Dec 22 19:52:19 1995
***************
*** 1,9 ****
! # @(#)Makefile 8.1 (Berkeley) 6/8/93
PROG= xroach
! MAN6= xroach.0
! CFLAGS+= -I${.CURDIR}/bitmaps
! DPADD= ${LIBX} ${LIBM}
! LDADD= -lX11/X11 -lm
.include <bsd.prog.mk>
--- 1,17 ----
! # @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= xroach
! MAN6= xroach.6
!
! DPADD+= ${X11BASE}/lib/libX11.a ${LIBM}
! CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/bitmaps
! LDDESTDIR+= -L${X11BASE}/lib
! LDADD+= -lX11 -lm
!
! MANDIR= ${X11BASE}/man/man
!
! BINOWN= bin
! BINDIR= ${X11BASE}/bin
! BINMODE= 755
.include <bsd.prog.mk>
--- Makefile.orig Tue Jun 8 19:12:04 1993
+++ Makefile Sun Sep 8 03:45:39 2002
@@ -1,9 +1,16 @@
-# @(#)Makefile 8.1 (Berkeley) 6/8/93
+# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= xroach
-MAN6= xroach.0
-CFLAGS+= -I${.CURDIR}/bitmaps
-DPADD= ${LIBX} ${LIBM}
-LDADD= -lX11/X11 -lm
+MAN6= xroach.6
+
+DPADD+= ${X11BASE}/lib/libX11.a ${LIBM}
+CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/bitmaps
+LDADD+= -L${X11BASE}/lib -lX11 -lm
+
+MANDIR= ${X11BASE}/man/man
+
+BINOWN= bin
+BINDIR= ${X11BASE}/bin
+BINMODE= 755
.include <bsd.prog.mk>