[comp.unix.questions] "diff files": how to use?

gordon@osiris.cso.uiuc.edu (John Gordon) (04/09/91)

	Hi, everyone.  I apologize if this is a simple question.  I have
several "diff files" and I don't know how they are used.  I did a man
on "diff" and read the FAQ, but neither seemed to help.  Thanks for any
help.  A sample of my diff file is appended.

---
John Gordon
Internet: gordon@osiris.cso.uiuc.edu        #include <disclaimer.h>
          gordon@cerl.cecer.army.mil       #include <clever_saying.h>

-----
*** Makefile.dist	Mon Jan 14 11:15:38 1991
--- Makefile	Thu Feb 28 13:08:51 1991
***************
*** 8,13 ****
--- 8,17 ----
  
  CFLAGS = -g
  
+ BINDIR = /usr/local/games
+ # this must match "GAME_HOME" in files.h
+ LIBDIR = /usr/local/games/lib/mdg
+ 
  DOBJSA = dmain.o seg.o monsters.o msghandler.o findplayer.o godpower.o
  DOBJSB = players.o random.o combat.o effect.o ranged.o speak.o dmsg.o
  DOBJSC = spells.o improve.o dident.o magic.o traps.o loadconfig.o
***************
*** 47,51 ****
--- 51,66 ----
  	
  ident : $(IOBJS)
  	cc $(CFLAGS) -o ident $(IOBJS)
+ 
+ install: $(PROGS)
+ 	strip $(PROGS)
+ 	cp mdg_char mdg_daemon mdg_stop mdg $(BINDIR)
+ 	ln $(BINDIR)/mdg_stop $(BINDIR)/mdg_save
+ 	-mkdir $(LIBDIR)
+ 	-mkdir $(LIBDIR)/bin
+ 	-mkdir $(LIBDIR)/players
+ 	cp ident mdg_clock $(LIBDIR)/bin
+ 	cp mdg_dir/default $(LIBDIR)/players
+ 	cp mdg_dir/item.start mdg_dir/map.start mdg_dir/monster.start mdg_dir/note.start $(LIBDIR)
  
  # end of Makefile.

jik@athena.mit.edu (Jonathan I. Kamens) (04/09/91)

In article <1991Apr8.195159.6848@ux1.cso.uiuc.edu>, gordon@osiris.cso.uiuc.edu (John Gordon) writes:
|> 	Hi, everyone.  I apologize if this is a simple question.  I have
|> several "diff files" and I don't know how they are used.  I did a man
|> on "diff" and read the FAQ, but neither seemed to help.  Thanks for any
|> help.  A sample of my diff file is appended.

  You apply them to the original files using the "patch" program.  If you have
patch installed, do "man patch".  If you don't have it installed, you can get
the sources via anonymous ftp from /pub/gnu on prep.ai.mit.edu, in the file
patch-2.0.12u3.tar.Z.

-- 
Jonathan Kamens			              USnail:
MIT Project Athena				11 Ashford Terrace
jik@Athena.MIT.EDU				Allston, MA  02134
Office: 617-253-8085			      Home: 617-782-0710