*** Makefile.2003-08-15.dsm	Fri Aug 15 14:12:20 2003
--- Makefile	Wed May 12 18:01:56 2004
***************
*** 1,3 ****
--- 1,5 ----
+ # based on Makefile.2003-08-15.dsm with additions by Julian H. Stacey
+ 
  #  
  #  Copyright (c) 2003, David S. Madole
  #  All rights reserved.
***************
*** 55,77 ****
  	sjrun.lang.default
  
  sjlcd:	sjlcd.c
! 	$(CC) $(CFLAGS) -o sjlcd sjlcd.c $(CFLAGS) $(LDFLAGS)
  
  sjctl:	sjctl.sh
! 	sed "s:%BINDIR%:$(BINDIR):g" sjctl.sh >sjctl
  
  sjrun:	sjrun.sh
! 	sed "s:%ETCDIR%:$(ETCDIR):g" sjrun.sh >sjrun
  
  pbm2lj:	pbm2lj.c
! 	$(CC) $(CFLAGS) -o pbm2lj pbm2lj.c $(CFLAGS) $(LDFLAGS)
  
  tiffres: tiffres.c
! 	$(CC) $(CFLAGS) -o tiffres tiffres.c $(CFLAGS) $(LDFLAGS)
  
  tiffrotate: tiffrotate.c
  	$(CC) $(CFLAGS) -o tiffrotate -I$(INCDIR) -L/$(LIBDIR) \
! 	      tiffrotate.c -ltiff
  
  sjrun.conf.default: sjrun.sh
  	sed	-e '1,2d' \
--- 57,79 ----
  	sjrun.lang.default
  
  sjlcd:	sjlcd.c
! 	$(CC) $(CFLAGS) -o sjlcd ${.CURDIR}/./sjlcd.c $(CFLAGS) $(LDFLAGS)
  
  sjctl:	sjctl.sh
! 	sed "s:%BINDIR%:$(BINDIR):g" ${.CURDIR}/./sjctl.sh >sjctl
  
  sjrun:	sjrun.sh
! 	sed "s:%ETCDIR%:$(ETCDIR):g" ${.CURDIR}/./sjrun.sh >sjrun
  
  pbm2lj:	pbm2lj.c
! 	$(CC) $(CFLAGS) -o pbm2lj ${.CURDIR}/./pbm2lj.c $(CFLAGS) $(LDFLAGS)
  
  tiffres: tiffres.c
! 	$(CC) $(CFLAGS) -o tiffres ${.CURDIR}/./tiffres.c $(CFLAGS) $(LDFLAGS)
  
  tiffrotate: tiffrotate.c
  	$(CC) $(CFLAGS) -o tiffrotate -I$(INCDIR) -L/$(LIBDIR) \
! 	      ${.CURDIR}/./tiffrotate.c -ltiff
  
  sjrun.conf.default: sjrun.sh
  	sed	-e '1,2d' \
***************
*** 79,85 ****
  		-e '/End of configuration/,$$d' \
  		-e '/^[^#]/s/^/#/' \
  		-e 's:%ETCDIR%:$(ETCDIR):g' \
! 		sjrun.sh >sjrun.conf.default
  
  sjrun.lang.default: sjrun.sh
  	sed	-e '1,2d' \
--- 81,87 ----
  		-e '/End of configuration/,$$d' \
  		-e '/^[^#]/s/^/#/' \
  		-e 's:%ETCDIR%:$(ETCDIR):g' \
! 		${.CURDIR}/./sjrun.sh >sjrun.conf.default
  
  sjrun.lang.default: sjrun.sh
  	sed	-e '1,2d' \
***************
*** 87,93 ****
  		-e '/End of translation/,$$d' \
  		-e /^[^#]/s/^/#/ \
  		-e 's:%ETCDIR%:$(ETCDIR):g' \
! 		sjrun.sh >sjrun.lang.default
  
  install: all
  	install -d -o root -g wheel -m 0755 $(DESTDIR)$(BINDIR)
--- 89,95 ----
  		-e '/End of translation/,$$d' \
  		-e /^[^#]/s/^/#/ \
  		-e 's:%ETCDIR%:$(ETCDIR):g' \
! 		${.CURDIR}/./sjrun.sh >sjrun.lang.default
  
  install: all
  	install -d -o root -g wheel -m 0755 $(DESTDIR)$(BINDIR)
***************
*** 123,126 ****
--- 125,131 ----
  	rm -f sjrun.conf.default sjrun.lang.default
  
  
+ # The next inclkude is to support bsd style make obj.
+ # The "${.CURDIR}/./" above support obj.
+ .include <bsd.prog.mk>
  #  End